添加客诉回访信息

watero-rst-core/src/main/java/com.iamberry.rst.core/address/City.java

@@ -0,0 +1,43 @@
+package com.iamberry.rst.core.address;
+
+public class City {
+    private Long cityId;
+
+    private Long provinceId;
+
+    private String city;
+
+    private Integer divisionCode;
+
+    public Long getCityId() {
+        return cityId;
+    }
+
+    public void setCityId(Long cityId) {
+        this.cityId = cityId;
+    }
+
+    public Long getProvinceId() {
+        return provinceId;
+    }
+
+    public void setProvinceId(Long provinceId) {
+        this.provinceId = provinceId;
+    }
+
+    public String getCity() {
+        return city;
+    }
+
+    public void setCity(String city) {
+        this.city = city == null ? null : city.trim();
+    }
+
+    public Integer getDivisionCode() {
+        return divisionCode;
+    }
+
+    public void setDivisionCode(Integer divisionCode) {
+        this.divisionCode = divisionCode;
+    }
+}

watero-rst-core/src/main/java/com.iamberry.rst.core/address/Country.java

@@ -0,0 +1,33 @@
+package com.iamberry.rst.core.address;
+
+public class Country {
+    private Long countryId;
+
+    private String countryName;
+
+    private String countryNo;
+
+    public Long getCountryId() {
+        return countryId;
+    }
+
+    public void setCountryId(Long countryId) {
+        this.countryId = countryId;
+    }
+
+    public String getCountryName() {
+        return countryName;
+    }
+
+    public void setCountryName(String countryName) {
+        this.countryName = countryName == null ? null : countryName.trim();
+    }
+
+    public String getCountryNo() {
+        return countryNo;
+    }
+
+    public void setCountryNo(String countryNo) {
+        this.countryNo = countryNo == null ? null : countryNo.trim();
+    }
+}

watero-rst-core/src/main/java/com.iamberry.rst.core/address/District.java

@@ -0,0 +1,43 @@
+package com.iamberry.rst.core.address;
+
+public class District {
+    private Long districtId;
+
+    private Long cityId;
+
+    private String district;
+
+    private Integer divisionCode;
+
+    public Long getDistrictId() {
+        return districtId;
+    }
+
+    public void setDistrictId(Long districtId) {
+        this.districtId = districtId;
+    }
+
+    public Long getCityId() {
+        return cityId;
+    }
+
+    public void setCityId(Long cityId) {
+        this.cityId = cityId;
+    }
+
+    public String getDistrict() {
+        return district;
+    }
+
+    public void setDistrict(String district) {
+        this.district = district == null ? null : district.trim();
+    }
+
+    public Integer getDivisionCode() {
+        return divisionCode;
+    }
+
+    public void setDivisionCode(Integer divisionCode) {
+        this.divisionCode = divisionCode;
+    }
+}

watero-rst-core/src/main/java/com.iamberry.rst.core/address/Province.java

@@ -0,0 +1,43 @@
+package com.iamberry.rst.core.address;
+
+public class Province {
+    private Long provinceId;
+
+    private Long countryId;
+
+    private String province;
+
+    private Integer divisionCode;
+
+    public Long getProvinceId() {
+        return provinceId;
+    }
+
+    public void setProvinceId(Long provinceId) {
+        this.provinceId = provinceId;
+    }
+
+    public Long getCountryId() {
+        return countryId;
+    }
+
+    public void setCountryId(Long countryId) {
+        this.countryId = countryId;
+    }
+
+    public String getProvince() {
+        return province;
+    }
+
+    public void setProvince(String province) {
+        this.province = province == null ? null : province.trim();
+    }
+
+    public Integer getDivisionCode() {
+        return divisionCode;
+    }
+
+    public void setDivisionCode(Integer divisionCode) {
+        this.divisionCode = divisionCode;
+    }
+}

watero-rst-interface/src/main/java/com/iamberry/rst/faces/address/AddressService.java

@@ -0,0 +1,35 @@
+package com.iamberry.rst.faces.address;
+
+import com.iamberry.rst.core.address.City;
+import com.iamberry.rst.core.address.District;
+import com.iamberry.rst.core.address.Province;
+
+import java.util.List;
+
+/**
+ * 获取地址接口
+ */
+public interface AddressService {
+
+    /**
+     *  获取省
+     * @param province
+     * @return
+     */
+    List<Province> listProvince(Province province);
+
+    /**
+     *  获取市
+     * @param city
+     * @return
+     */
+    List<City> listCity(City city);
+
+    /**
+     *  获取省
+     * @param district
+     * @return
+     */
+    List<District> listDistrict(District district);
+
+}

watero-rst-service/src/main/java/com/iamberry/rst/service/address/AddressServiceImpl.java

@@ -0,0 +1,37 @@
+package com.iamberry.rst.service.address;
+
+
+import com.iamberry.rst.core.address.City;
+import com.iamberry.rst.core.address.District;
+import com.iamberry.rst.core.address.Province;
+import com.iamberry.rst.faces.address.AddressService;
+import com.iamberry.rst.service.address.mapper.AddressMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class AddressServiceImpl implements AddressService {
+
+    @Autowired
+    private AddressMapper addressMapper;
+
+    @Override
+    public List<Province> listProvince(Province province) {
+        province.setCountryId((long) 1);
+        return addressMapper.listProvince(province);
+    }
+
+    @Override
+    public List<City> listCity(City city) {
+        return addressMapper.listCity(city);
+    }
+
+    @Override
+    public List<District> listDistrict(District district) {
+        return addressMapper.listDistrict(district);
+    }
+
+
+}

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

@@ -0,0 +1,35 @@
+package com.iamberry.rst.service.address.mapper;
+
+import com.iamberry.rst.core.address.City;
+import com.iamberry.rst.core.address.District;
+import com.iamberry.rst.core.address.Province;
+
+import java.util.List;
+
+/**
+ * 获取省市区
+ */
+public interface AddressMapper {
+
+    /**
+     *  获取省
+     * @param province
+     * @return
+     */
+    List<Province> listProvince(Province province);
+
+    /**
+     *  获取市
+     * @param city
+     * @return
+     */
+    List<City> listCity(City city);
+
+    /**
+     *  获取省
+     * @param district
+     * @return
+     */
+    List<District> listDistrict(District district);
+
+}

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

@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.iamberry.rst.service.address.mapper.AddressMapper" >
+
+  <select id="listProvince" resultType="Province" parameterType="Province" >
+    select 
+    province_id, country_id, province, division_code
+    from tb_rst_address_province
+    <where>
+      <if test="countryId !=null and countryId !=''">
+        country_id = #{countryId}
+      </if>
+    </where>
+  </select>
+
+  <select id="listCity" resultType="City" parameterType="City" >
+    select
+        city_id,
+        province_id,
+        city,
+        division_code
+    from tb_rst_address_city
+    <where>
+      <if test="provinceId !=null and provinceId !=''">
+        province_id = #{provinceId}
+      </if>
+    </where>
+  </select>
+
+  <select id="listDistrict" resultType="District" parameterType="District" >
+      district_id,
+      city_id,
+      district,
+      division_code
+    from tb_rst_address_district
+    <where>
+      <if test="cityId !=null and cityId !=''">
+        city_id = #{cityId}
+      </if>
+    </where>
+  </select>
+
+</mapper>

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

@@ -0,0 +1,75 @@
+package com.iamberry.rst.controllers.address;
+
+import com.iamberry.rst.core.address.City;
+import com.iamberry.rst.core.address.District;
+import com.iamberry.rst.core.address.Province;
+import com.iamberry.rst.faces.address.AddressService;
+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.ResponseBody;
+
+import java.util.List;
+
+@Controller
+@RequestMapping("/address")
+public class AddressController {
+    @Autowired
+    private AddressService addressService;
+
+    /**
+     *  获取省
+     * @param province
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping(value = "/list_province")
+    ResponseJson listProvince(Province province){
+        ResponseJson rj =new ResponseJson(200, "查询成功", 200);
+        List<Province> provinceList = addressService.listProvince(province);
+        rj.addResponseKeyValue("provinceList", provinceList);
+        if (provinceList == null || provinceList.size() < 1) {
+            return new ResponseJson(500, "查询失败", 500);
+        } else {
+            return rj;
+        }
+    }
+
+    /**
+     *  获取市
+     * @param city
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping(value = "/list_city")
+    ResponseJson listCity(City city){
+        ResponseJson rj =new ResponseJson(200, "查询成功", 200);
+        List<City> cityList = addressService.listCity(city);
+        rj.addResponseKeyValue("cityList", cityList);
+        if (cityList == null || cityList.size() < 1) {
+            return new ResponseJson(500, "查询失败", 500);
+        } else {
+            return rj;
+        }
+    }
+
+    /**
+     *  获取省
+     * @param district
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping(value = "/list_district")
+    ResponseJson listDistrict(District district){
+        ResponseJson rj =new ResponseJson(200, "查询成功", 200);
+        List<District> districtList = addressService.listDistrict(district);
+        rj.addResponseKeyValue("cityList", districtList);
+        if (districtList == null || districtList.size() < 1) {
+            return new ResponseJson(500, "查询失败", 500);
+        } else {
+            return rj;
+        }
+    }
+
+}

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

@@ -8,6 +8,10 @@ import com.iamberry.rst.faces.cm.*;
 import com.iamberry.rst.faces.product.ProductService;
 import com.iamberry.rst.faces.sys.SysService;
 import com.iamberry.rst.utils.StitchAttrUtil;
+import com.iamberry.rst.faces.address.AddressService;
+import com.iamberry.rst.faces.cm.CompanyInfoService;
+import com.iamberry.rst.faces.cm.SalesOrderService;
+import com.iamberry.rst.faces.cm.StoreInfoService;
 import com.iamberry.wechat.tools.ResponseJson;
 import org.apache.commons.lang.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -51,6 +55,8 @@ public class AdminCustomerController {
     public AdminCustomerController() {
     }
 
+
+
     /**
      * 获取客诉列表
      *

watero-rst-web/src/main/resources/watero-rst-orm.xml

@@ -80,6 +80,10 @@
 		<typeAlias type="com.iamberry.rst.core.cm.StoreInfo" alias="StoreInfo"/>
 		<typeAlias type="com.iamberry.rst.core.cm.Visit" alias="Visit"/>
 
+		<typeAlias type="com.iamberry.rst.core.address.City" alias="City"/>
+		<typeAlias type="com.iamberry.rst.core.address.Country" alias="Country"/>
+		<typeAlias type="com.iamberry.rst.core.address.District" alias="District"/>
+		<typeAlias type="com.iamberry.rst.core.address.Province" alias="Province"/>
 	</typeAliases>
 	<!-- PageHelper -->
 	<plugins>
@@ -132,5 +136,8 @@
 		<mapper resource="com/iamberry/rst/service/cm/mapper/fittingsInfoMapper.xml"/>
 		<mapper resource="com/iamberry/rst/service/cm/mapper/salesOrderMapper.xml"/>
 		<mapper resource="com/iamberry/rst/service/cm/mapper/storeInfoMapper.xml"/>
+
+		<mapper resource="com/iamberry/rst/service/address/mapper/addressMapper.xml"/>
+
 	</mappers>
 </configuration>

watero-rst-web/src/main/webapp/WEB-INF/views/base/add_base.ftl

@@ -25,8 +25,9 @@
 <script type="text/javascript" src="${path}/common/lib/jquery.validation/1.14.0/messages_zh.js"></script>
 <script type="text/javascript" src="${path}/common/lib/Validform/Validform_v5.3.2.js"></script>
 
-<script type="text/javascript" src="${path}/common/js/common/common.js"></script>
 <script type="text/javascript">
-    // 判断<script type="text/javascript" src="${path}/common/js/common/common.js"></script>
     var root_path = "${path}";
-</script>
+</script>
+
+
+<script type="text/javascript" src="${path}/common/js/common/common.js"></script>

watero-rst-web/src/main/webapp/WEB-INF/views/base/list_base.ftl

@@ -23,8 +23,9 @@
 <script type="text/javascript" src="${path}/common/lib/datatables/1.10.0/jquery.dataTables.min.js"></script>
 <script type="text/javascript" src="${path}/common/lib/laypage/1.2/laypage.js"></script>
 
-<script type="text/javascript" src="${path}/common/js/common/common.js"></script>
 <script type="text/javascript">
     // 判断
     var root_path = "${path}";
-</script>
+</script>
+
+<script type="text/javascript" src="${path}/common/js/common/common.js"></script>

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

@@ -666,17 +666,32 @@
             error: function(XmlHttpRequest, textStatus, errorThrown){
             }
         });
+
+        setAdress();
     }
 
     /**
      * 设置地址
      */
     function setAdress(){
-
+        setPro(1);
     }
-    
-    function setPro() {
-        
+
+    /**
+     * 设置省
+     */
+    function setPro(provinceName) {
+        var province = listProvince();
+        alert(JSON.stringify(province));
+        if(province!=null){
+            var provinceHtml = ''
+            for(var i=0;i<province.length;i++){
+//                if(){
+//
+//                }
+                provinceHtml += '';
+            }
+        }
     }
 </script>
 <!--/请在上方写此页面业务相关的脚本-->

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

@@ -14,7 +14,7 @@
         *{padding: 0;margin: 0;}
         .my-input{border: 1px solid rgba(0,0,0,.1);padding: 1px 5px;height: 32px;margin-right: 10px;}
         /*.my-input::-webkit-input-placeholder,.my-select{color: #dcdcdc;}*/
-        .my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(/common/images/pts/select-1.png) right center no-repeat;background-size:auto 100%;}
+        .my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/select-1.png) right center no-repeat;background-size:auto 100%;}
         .my-btn-search{border: 1px solid #32a3d8;padding: 1px 25px;height: 32px;background-color: #32a3d8;color: #fff;}
         .barcodeImg{margin:10px 0px}
         .table-bg thead th{background-color: #e2f6ff;}

watero-rst-web/src/main/webapp/WEB-INF/views/cm/inspection/add_detect.ftl

@@ -21,8 +21,8 @@
         .my-btn-reset{padding: 10px 20px;width: 150px; background-color: #fff;color: #32a3d8;border: 1px solid #32a3d8;cursor:pointer;margin: 10px 10px 0 10px;}
         .my-btn-submit{padding: 10px 20px;width: 150px; background-color: #32a3d8;color: #fff;border: 1px solid #32a3d8;cursor:pointer;margin: 10px 10px 0 10px;}
         .my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;width: 60%; height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(http://s.iamberry.com/images/select-1.png) right center no-repeat #fff;background-size:auto 100%;}
-        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
-        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
     </style>
     <meta name="keywords" content="${path}">
     <meta name="description" content="H-ui.admin v3.0，是一款由国人开发的轻量级扁平化网站后台模板，完全免费开源的网站后台管理系统模版，适合中小型CMS后台系统。">

watero-rst-web/src/main/webapp/WEB-INF/views/cm/inspection/detect_list.ftl

@@ -7,12 +7,12 @@
         *{padding: 0;margin: 0;}
         .my-input{border: 1px solid rgba(0,0,0,.1);padding: 1px 5px;height: 25px;margin-right: 5px;}
         /*.my-input::-webkit-input-placeholder,.my-select{color: #dcdcdc;}*/
-        .my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(/common/images/pts/select-1.png) right center no-repeat;background-size:auto 100%;}
+        .my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/select-1.png) right center no-repeat;background-size:auto 100%;}
         .my-btn-search{border: 1px solid #32a3d8;padding: 1px 25px;height: 32px;background-color: #32a3d8;color: #fff;}
         .barcodeImg{margin:10px 0px}
         .table-bg thead th{background-color: #e2f6ff;}
-        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
-        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
     </style>
 <#include "/base/list_base.ftl">
 </head>

watero-rst-web/src/main/webapp/WEB-INF/views/pts/batch/add_batch.ftl

@@ -11,8 +11,8 @@
     <link href="${path}/common/lib/jquery.ui/jquery-ui.css" rel="stylesheet" type="text/css"/>
     <style>
         .add-list>li{margin: 10px 0;}
-        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
-        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
     </style>
     <title>添加批次 - 批次管理 - RST</title>
 </head>

watero-rst-web/src/main/webapp/WEB-INF/views/pts/batch/batch_list.ftl

@@ -11,15 +11,16 @@
 <#include "/base/list_base.ftl">
     <title>批次列表</title>
     <style>
+        html{-webkit-text-size-adjust:none;}
         *{padding: 0;margin: 0;}
         .my-input{border: 1px solid rgba(0,0,0,.1);padding: 1px 5px;height: 32px;margin-right: 10px;}
         /*.my-input::-webkit-input-placeholder,.my-select{color: #dcdcdc;}*/
-        .my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(/common/images/pts/select-1.png) right center no-repeat;background-size:auto 100%;}
+        .my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/select-1.png) right center no-repeat;background-size:auto 100%;}
         .my-btn-search{border: 1px solid #32a3d8;padding: 1px 25px;height: 32px;background-color: #32a3d8;color: #fff;}
         .barcodeImg{margin:10px 0px}
         .table-bg thead th{background-color: #e2f6ff;}
-        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
-        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
     </style>
 </head>
 <body>
@@ -52,7 +53,7 @@
             <th width="50">所属产品</th>
             <th width="60">批次编号</th>
             <th width="100">总数量</th>
-            <th width="80">生产数量</th>
+            <th width="80">已生产数量<br><span style="font-weight: normal;">(已生成的机器数量)</span></th>
             <th width="80">状态</th>
             <th width="100">软件版本</th>
             <th width="80">Bom单名称</th>

watero-rst-web/src/main/webapp/WEB-INF/views/pts/batch/update_batch.ftl

@@ -7,12 +7,12 @@
     <meta name="viewport"
           content="width=device-width,initial-scale=1,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no"/>
     <meta http-equiv="Cache-Control" content="no-siteapp"/>
-<#include "/base/add_base.ftl">
+    <#include "/base/add_base.ftl">
     <link href="${path}/common/lib/jquery.ui/jquery-ui.css" rel="stylesheet" type="text/css"/>
     <style>
         .add-list>li{margin: 10px 0;}
-        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
-        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
     </style>
     <title>修改批次 - 批次管理 - RST</title>
 </head>

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

@@ -7,12 +7,12 @@
     <meta name="viewport"
           content="width=device-width,initial-scale=1,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no"/>
     <meta http-equiv="Cache-Control" content="no-siteapp"/>
-<#include "/base/add_base.ftl">
+    <#include "/base/add_base.ftl">
     <link href="${path}/common/lib/jquery.ui/jquery-ui.css" rel="stylesheet" type="text/css"/>
     <style>
         .add-list>li{margin: 10px 0;}
-        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
-        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
     </style>
     <title>添加Bom - Bom管理 - RST</title>
 </head>

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

@@ -7,7 +7,7 @@
     <meta name="viewport"
           content="width=device-width,initial-scale=1,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no"/>
     <meta http-equiv="Cache-Control" content="no-siteapp"/>
-<#include "/base/add_base.ftl">
+    <#include "/base/add_base.ftl">
     <link href="${path}/common/lib/jquery.ui/jquery-ui.css" rel="stylesheet" type="text/css"/>
     <style>
         .content { width: 100%; margin: 0 auto;font-size: 12px;}
@@ -24,8 +24,8 @@
         .my-btn-reset{padding: 6px 20px;width: 150px; background-color: #fff;color: #32a3d8;border: 1px solid #32a3d8;cursor:pointer;margin: 10px 10px 0 10px;}
         .my-btn-submit{padding: 6px 20px;width: 150px; background-color: #32a3d8;color: #fff;border: 1px solid #32a3d8;cursor:pointer;margin: 10px 10px 0 10px;}
         .my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;width: 60%; height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/select-1.png) right center no-repeat #fff;background-size:auto 100%;}
-        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
-        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
         .my-con-right{width: 80px;float: left; text-align: right; }
         .my-con-left{width: 80%; display: block; float: left;padding-left: 20px; font-size: 14px;line-height: 20px;}
         .my-con-text{width: 80%; padding-left: 8px; }

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

@@ -8,18 +8,18 @@
     <meta http-equiv="Cache-Control" content="no-siteapp" />
     <link rel="Bookmark" href="/favicon.ico" >
     <link rel="Shortcut Icon" href="/favicon.ico" />
-<#include "/base/list_base.ftl">
+    <#include "/base/list_base.ftl">
     <title>bom单列表</title>
     <style>
         *{padding: 0;margin: 0;}
         .my-input{border: 1px solid rgba(0,0,0,.1);padding: 1px 5px;height: 32px;margin-right: 10px;}
         /*.my-input::-webkit-input-placeholder,.my-select{color: #dcdcdc;}*/
-        .my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(/common/images/pts/select-1.png) right center no-repeat;background-size:auto 100%;}
+        .my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/select-1.png) right center no-repeat;background-size:auto 100%;}
         .my-btn-search{border: 1px solid #32a3d8;padding: 1px 25px;height: 32px;background-color: #32a3d8;color: #fff;}
         .barcodeImg{margin:10px 0px}
         .table-bg thead th{background-color: #e2f6ff;}
-        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
-        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
     </style>
 </head>
 <body>

watero-rst-web/src/main/webapp/WEB-INF/views/pts/device/add_device.ftl

@@ -17,8 +17,8 @@
         .my-btn-reset{padding: 10px 20px;width: 150px; background-color: #fff;color: #32a3d8;border: 1px solid #32a3d8;cursor:pointer;margin: 10px 10px 0 10px;}
         .my-btn-submit{padding: 10px 20px;width: 150px; background-color: #32a3d8;color: #fff;border: 1px solid #32a3d8;cursor:pointer;margin: 10px 10px 0 10px;}
         .my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;width: 60%; height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(http://s.iamberry.com/images/select-1.png) right center no-repeat #fff;background-size:auto 100%;}
-        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
-        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
     </style>
 </head>
 <body>

watero-rst-web/src/main/webapp/WEB-INF/views/pts/device/device_list.ftl

@@ -3,18 +3,19 @@
 <head>
     <meta charset="UTF-8">
     <title></title>
+    <#include "/base/list_base.ftl">
     <style>
         *{padding: 0;margin: 0;}
         .my-input{border: 1px solid rgba(0,0,0,.1);padding: 1px 5px;height: 32px;margin-right: 10px;}
         /*.my-input::-webkit-input-placeholder,.my-select{color: #dcdcdc;}*/
-        .my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(/common/images/pts/select-1.png) right center no-repeat;background-size:auto 100%;}
+        .my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/select-1.png) right center no-repeat;background-size:auto 100%;}
         .my-btn-search{border: 1px solid #32a3d8;padding: 1px 25px;height: 32px;background-color: #32a3d8;color: #fff;}
         .barcodeImg{margin:10px 0px}
         .table-bg thead th{background-color: #e2f6ff;}
-        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
-        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
     </style>
-<#include "/base/list_base.ftl">
+
 </head>
 <body>
 <nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页

watero-rst-web/src/main/webapp/WEB-INF/views/pts/device/update_device.ftl

@@ -17,8 +17,8 @@
         .my-btn-reset{padding: 10px 20px;width: 150px; background-color: #fff;color: #32a3d8;border: 1px solid #32a3d8;cursor:pointer;margin: 10px 10px 0 10px;}
         .my-btn-submit{padding: 10px 20px;width: 150px; background-color: #32a3d8;color: #fff;border: 1px solid #32a3d8;cursor:pointer;margin: 10px 10px 0 10px;}
         .my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;width: 60%; height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(http://s.iamberry.com/images/select-1.png) right center no-repeat #fff;background-size:auto 100%;}
-        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
-        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
     </style>
 </head>
 <body>

watero-rst-web/src/main/webapp/WEB-INF/views/pts/device/update_process.ftl

@@ -3,6 +3,7 @@
 <head>
     <meta charset="UTF-8">
     <title></title>
+    <#include "/base/list_base.ftl">
     <style>
         article, section, time, aside {
             display: block;
@@ -141,18 +142,18 @@
         }
 
         /*设置Select样式*/
-        select{border: 1px solid rgba(0,0,0,.1);border-radius: 5px;padding:6px 35px 6px 5px;height: 32px;-webkit-appearance:none;appearance:none;background: url(/common/images/pts/select-1.png) right center no-repeat !important;background-size:auto 100% !important;margin-right: 10px;width: 85px;}
+        select{border: 1px solid rgba(0,0,0,.1);border-radius: 5px;padding:6px 35px 6px 5px;height: 32px;-webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/select-1.png) right center no-repeat !important;background-size:auto 100% !important;margin-right: 10px;width: 100px;}
         .add-title-left{position: absolute;right: 0;top: 15%;}
         .add-title-right{position: absolute;left: 55%;top:33%;}
         .my-btn-edit{padding: 6px 20px;background-color: #fff;color: #32a3d8;border: 1px solid #32a3d8;cursor:pointer;margin: 5px 0 5px 0;}
         .list-main{list-style-type: none;margin: 0;padding: 10px;overflow-x: scroll;white-space: nowrap;}
-        .list-main>li{display: table-cell;min-width: 500px;position: relative;width: 500px;margin-right: 20px;}
+        .list-main>li{display: table-cell;min-width: 550px;position: relative;width: 550px;margin-right: 20px;}
         .list-main >li :hover{
             background: #f0f0f0;
         }
         time > span{font-size: 13px;}
     </style>
-<#include "/base/list_base.ftl">
+
 </head>
 <body>
 <nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页

watero-rst-web/src/main/webapp/WEB-INF/views/pts/employee/employee_list.ftl

@@ -8,18 +8,18 @@
     <meta http-equiv="Cache-Control" content="no-siteapp" />
     <link rel="Bookmark" href="/favicon.ico" >
     <link rel="Shortcut Icon" href="/favicon.ico" />
-<#include "/base/list_base.ftl">
+    <#include "/base/list_base.ftl">
     <title>员工列表</title>
     <style>
         *{padding: 0;margin: 0;}
         .my-input{border: 1px solid rgba(0,0,0,.1);padding: 1px 5px;height: 32px;margin-right: 10px;}
         /*.my-input::-webkit-input-placeholder,.my-select{color: #dcdcdc;}*/
-        .my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(/common/images/pts/select-1.png) right center no-repeat;background-size:auto 100%;}
+        .my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/select-1.png) right center no-repeat;background-size:auto 100%;}
         .my-btn-search{border: 1px solid #32a3d8;padding: 1px 25px;height: 32px;background-color: #32a3d8;color: #fff;}
         .barcodeImg{margin:10px 0px}
         .table-bg thead th{background-color: #e2f6ff;}
-        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
-        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
     </style>
 </head>
 <body>

watero-rst-web/src/main/webapp/WEB-INF/views/pts/employee/save_employee.ftl

@@ -21,8 +21,8 @@
         .my-btn-reset{padding: 6px 20px;width: 150px; background-color: #fff;color: #32a3d8;border: 1px solid #32a3d8;cursor:pointer;margin: 10px 10px 0 10px;}
         .my-btn-submit{padding: 6px 20px;width: 150px; background-color: #32a3d8;color: #fff;border: 1px solid #32a3d8;cursor:pointer;margin: 10px 10px 0 10px;}
         .my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;width: 60%; height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/select-1.png) right center no-repeat #fff;background-size:auto 100%;}
-        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
-        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
     </style>
     <title>添加员工- 员工管理 - RST</title>
 </head>

watero-rst-web/src/main/webapp/WEB-INF/views/pts/employee/update_employee.ftl

@@ -21,8 +21,8 @@
         .my-btn-reset{padding: 8px 20px;width: 150px; background-color: #fff;color: #32a3d8;border: 1px solid #32a3d8;cursor:pointer;margin: 10px 10px 0 10px;}
         .my-btn-submit{padding: 8px 20px;width: 150px; background-color: #32a3d8;color: #fff;border: 1px solid #32a3d8;cursor:pointer;margin: 10px 10px 0 10px;}
         .my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;width: 60%; height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/select-1.png) right center no-repeat #fff;background-size:auto 100%;}
-        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
-        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
     </style>
     <title>修改员工- 员工管理 - RST</title>
 </head>

watero-rst-web/src/main/webapp/WEB-INF/views/pts/machine/addRenovationMachine.ftl

@@ -6,6 +6,7 @@
 <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
 <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no" />
 <meta http-equiv="Cache-Control" content="no-siteapp" />
+<#include "/base/add_base.ftl">
 <title>添加翻新机</title>
     <style>
         .my-title{font-weight: 500;padding-left: 15px;position: relative;}
@@ -20,11 +21,11 @@
         .my-btn-reset{padding: 10px 20px;width: 150px; background-color: #fff;color: #32a3d8;border: 1px solid #32a3d8;cursor:pointer;margin: 10px 10px 0 10px;}
         .my-btn-submit{padding: 10px 20px;width: 150px; background-color: #32a3d8;color: #fff;border: 1px solid #32a3d8;cursor:pointer;margin: 10px 10px 0 10px;}
         .my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;width: 80%; height: 34px; -webkit-appearance:none;appearance:none;background: url(http://s.iamberry.com/images/select-1.png) right center no-repeat #fff;background-size:auto 100%;}
-        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
-        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
     	.spanhidth{width: 70px;text-align: right;}
 	</style>
-<#include "/base/add_base.ftl">
+
 </head>
 <body>
 <div class="pd-20">

watero-rst-web/src/main/webapp/WEB-INF/views/pts/machine/batchAddMachine.ftl

@@ -6,6 +6,7 @@
 <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
 <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no" />
 <meta http-equiv="Cache-Control" content="no-siteapp" />
+<#include "/base/add_base.ftl">
 <title>添加机器</title>
     <style>
         .my-title{font-weight: 500;padding-left: 15px;position: relative;}
@@ -20,11 +21,11 @@
         .my-btn-reset{padding: 10px 20px;width: 150px; background-color: #fff;color: #32a3d8;border: 1px solid #32a3d8;cursor:pointer;margin: 10px 10px 0 10px;}
         .my-btn-submit{padding: 10px 20px;width: 150px; background-color: #32a3d8;color: #fff;border: 1px solid #32a3d8;cursor:pointer;margin: 10px 10px 0 10px;}
         .my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;width: 60%; height: 34px; -webkit-appearance:none;appearance:none;background: url(http://s.iamberry.com/images/select-1.png) right center no-repeat #fff;background-size:auto 100%;}
-        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
-        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
     	.spanhidth{width: 48px;}
 	</style>
-<#include "/base/add_base.ftl">
+
 </head>
 <body>
 <div class="pd-20">

watero-rst-web/src/main/webapp/WEB-INF/views/pts/machine/machine_List.ftl

@@ -3,18 +3,18 @@
 	<head>
 		<meta charset="UTF-8">
 		<title></title>
+        <#include "/base/list_base.ftl">
 		<style>
 			*{padding: 0;margin: 0;}
 			.my-input{border: 1px solid rgba(0,0,0,.1);padding: 1px 5px;height: 32px;margin-right: 10px;}
 			/*.my-input::-webkit-input-placeholder,.my-select{color: #dcdcdc;}*/
-			.my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(/common/images/pts/select-1.png) right center no-repeat;background-size:auto 100%;}
+			.my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/select-1.png) right center no-repeat;background-size:auto 100%;}
 			.my-btn-search{border: 1px solid #32a3d8;padding: 1px 25px;height: 32px;background-color: #32a3d8;color: #fff;}
             .barcodeImg{margin:10px 0px}
             .table-bg thead th{background-color: #e2f6ff;}
-            input[type=radio]{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
-            input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+            input[type=radio]{-webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+            input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
 		</style>
-		<#include "/base/list_base.ftl">
 	</head>
 	<body>
     <nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页

watero-rst-web/src/main/webapp/WEB-INF/views/pts/machine/machine_particulars.ftl

@@ -3,6 +3,7 @@
 <head>
     <meta charset="UTF-8">
     <title></title>
+    <#include "/base/list_base.ftl">
     <style>
         .my-title{font-weight: 500;padding-left: 15px;position: relative;}
         .my-title:after{content: '';position: absolute;left: 0;top:12%;width: 3px;height: 80%;background: #32a3d8;}
@@ -125,12 +126,12 @@
         .content .things{margin-bottom: 0;}
         .things>.items{margin: 0 15px;}
         p{margin: 0;}
-        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
-        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
         .rj-a{text-decoration:none; color: #f6393f;}
         .rj-a:hover{text-decoration:underline;color: #f6393f;}
     </style>
-<#include "/base/list_base.ftl">
+
 </head>
 <body>
 <nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页

watero-rst-web/src/main/webapp/WEB-INF/views/pts/machine/machine_print_List.ftl

@@ -3,17 +3,17 @@
 	<head>
 		<meta charset="UTF-8">
 		<title></title>
+        <#include "/base/list_base.ftl">
 		<style>
             *{padding: 0;margin: 0;}
 			.my-input{border: 1px solid rgba(0,0,0,.1);padding: 1px 5px;height: 32px;margin-right: 10px;}
 			.my-input::-webkit-input-placeholder,.my-select{color: #dcdcdc;}
-			.my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(/common/images/pts/select-1.png) right center no-repeat;background-size:auto 100%;}
+			.my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/select-1.png) right center no-repeat;background-size:auto 100%;}
 			.my-btn-search{border: 1px solid #32a3d8;padding: 1px 25px;height: 32px;background-color: #32a3d8;color: #fff;}
             .barcodeImg{margin:10px 0px}
 			.isprint{width: 200px;height:50px;}
             .background{background-color: #0a6999}
 		</style>
-		<#include "/base/list_base.ftl">
 	</head>
 	<body>
     <nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页
@@ -59,34 +59,34 @@
                             <#assign machineList = page.dataList />
                         </#if>
                         <#if machineList?? &&  (machineList?size > 0) >
-                            <#list machineList as list>
-                                <tr class="text-c" id="${list.machineBarcode }">
-                                    <td width="2">
-                                        <input name='checkbox' type='checkbox' value='${list.machineBarcode }${list.machineQrcode }${list.machineProduceType }' machineId="${list.machineId }">
-                                        <input type="hidden" value="${list.machineId + 1000000 }" id="${list.machineBarcode + 'Id'}">
-                                    </td>
-                                    <td class="text-c" style="font-size: 24px" width="10">${list.machineBarcode?substring(list.machineBarcode?length-4) }</td>
-                                    <td class="text-c" width="10">${list.machineBarcode }</td>
-                                    <td class="text-c" width="6">
-                                        <#if list.machineProduceType == 1>
-                                            净水机
-                                        </#if>
-                                        <#if list.machineProduceType == 2>
-                                            冲奶机
-                                        </#if>
-                                    </td>
-                                    <td>${(list.machineCreateTime?string("yyyy-MM-dd HH:mm:ss"))!''}</td>
-                                    <!-- 遍历操作 -->
-                                    <td class="td-manage text-c">
-                                        <#if machineIsPrint == '1'>
-                                        <a onclick="updatePrint('${list.machineBarcode}');" title="修改为已打印" href="javascript:;"  class="ml-5" style="text-decoration:none"><i class="Hui-iconfont">&#xe6a7;</i></a>
-                                        </#if>
-                                        <a onclick="barCodePrint('${list.machineBarcode }'+'${list.machineQrcode }'+'${list.machineProduceType }','${list.machineId }');" title="打印" href="javascript:;"  class="ml-5" style="text-decoration:none"><i class="Hui-iconfont">&#xe652;</i></a>
-                                    </td>
-                                </tr>
-                            </#list>
+                        <#list machineList as list>
+                            <tr class="text-c" id="${list.machineBarcode }">
+                                <td width="2">
+                                    <input name='checkbox' type='checkbox' value='${list.machineBarcode }${list.machineQrcode }${list.machineProduceType }' machineId="${list.machineId }">
+                                    <input type="hidden" value="${list.machineId + 1000000 }" id="${list.machineBarcode + 'Id'}">
+                                </td>
+                                <td class="text-c" style="font-size: 24px" width="10">${list.machineBarcode?substring(list.machineBarcode?length-4) }</td>
+                                <td class="text-c" width="10">${list.machineBarcode }</td>
+                                <td class="text-c" width="6">
+                                    <#if list.machineProduceType == 1>
+                                        净水机
+                                    </#if>
+                                    <#if list.machineProduceType == 2>
+                                        冲奶机
+                                    </#if>
+                                </td>
+                                <td>${(list.machineCreateTime?string("yyyy-MM-dd HH:mm:ss"))!''}</td>
+                                <!-- 遍历操作 -->
+                                <td class="td-manage text-c">
+                                    <#if machineIsPrint == '1'>
+                                        <a onclick="updatePrint('${list.machineBarcode}',true);" title="修改为已打印" href="javascript:;"  class="ml-5" style="text-decoration:none"><i class="Hui-iconfont">&#xe6a7;</i></a>
+                                    </#if>
+                                    <a onclick="barCodePrint('${list.machineBarcode }'+'${list.machineQrcode }'+'${list.machineProduceType }','${list.machineId }');" title="打印" href="javascript:;"  class="ml-5" style="text-decoration:none"><i class="Hui-iconfont">&#xe652;</i></a>
+                                </td>
+                            </tr>
+                        </#list>
                         <#else>
-                            <tr><td colspan="5" class="td-manage text-c" >暂时没有机器，请添加！</td></tr>
+                        <tr><td colspan="5" class="td-manage text-c" >暂时没有机器，请添加！</td></tr>
                         </#if>
                     </tbody>
                 </table>
@@ -197,12 +197,22 @@
                                     '<span style="position: absolute;right: 9px;top: 85px;font-size: 12px;">'+ machineNo +'</span>' +
                                     '</div>');
                         }
-                        /*updatePrint(machineBarcode);*/
+                        if(${machineIsPrint} == '1')
+                        {
+                            updatePrint(machineBarcode,false);
+                            $("#" + machineBarcode).remove();
+                        }
                     }
                 });
                 numbers = numbers - parseInt(settingNumber);
-                if(numbers > 40){
-                    layer.msg('一次最多支持打印40张条形码', {icon: 2, time: 2000});
+
+                /*计算总打印数量*/
+                var num = $("#settingNumber").val();
+                var selectNum = $("#listid").find("input[name='checkbox']:checked").length;
+                var machinePrintNumber = parseInt(num)*parseInt(selectNum);
+
+                if(machinePrintNumber > 24){
+                    layer.msg('一次最多支持打印24张条形码', {icon: 2, time: 2000});
                 }else if (prints != ""){
                     $("#printlist").printArea();
                     $("#printlist").html("");
@@ -210,6 +220,9 @@
                 } else {
                     layer.msg('未选中需要打印的条形码', {icon: 2, time: 2000});
                 }
+
+                $("#printlist").html("");  //未打印成功，需要清除数据
+
                 /*if (prints != "") {
                     $("#printlist").printArea();
                     $("#printlist").html("");
@@ -252,7 +265,7 @@
                                     '<td class="text-c" style="font-size: 24px" width="10">'+private+'</td>' +
                                             '<td class="text-c" width="10">'+value.machineBarcode+'</td>' +
                                             '<td class="text-c" width="10">'+machineType+'</td>' +
-                                            '<td class="td-manage text-c"> <a onclick="updatePrint('+value.machineBarcode+');" title="修改为已打印" href="javascript:;"  class="ml-5" style="text-decoration:none"><i class="Hui-iconfont">&#xe6a7;</i></a>' +
+                                            '<td class="td-manage text-c"> <a onclick="updatePrint('+value.machineBarcode+',true);" title="修改为已打印" href="javascript:;"  class="ml-5" style="text-decoration:none"><i class="Hui-iconfont">&#xe6a7;</i></a>' +
                                             '<a onclick="barCodePrint('+value.machineBarcode+value.machineQrcode+value.machineProduceType+','+value.machineId+');" title="打印" href="javascript:;"  class="ml-5" style="text-decoration:none"><i class="Hui-iconfont">&#xe652;</i></a> </td></tr>');
 
 
@@ -269,7 +282,7 @@
             }
 
 
-                function updatePrint(machineBarcode){
+                function updatePrint(machineBarcode,type){
                     $.ajax({
                         "type" : "post",
                         "url" : "${path}/admin/machine/_update_print",
@@ -277,7 +290,9 @@
                         "data" :{machineBarcode : machineBarcode},
                         "success" : function(data) {
                             $("#"+machineBarcode).remove();
-                            layer.msg('修改成功', {icon: 1, time: 2000});
+                            if(type){
+                                layer.msg('修改成功', {icon: 1, time: 2000});
+                            }
                         },
                         "error":function(data){
                             layer.msg('操作失败', {icon: 2, time: 2000});
@@ -302,6 +317,7 @@
                     /*"data" :{machineBarcodes : JSON.stringify(a)},*/
                     "success" : function(data) {
                         layer.msg('修改成功!', {icon: 1,time:2000});
+                        location.replace(location.href);
                     },
                     "error":function(data){
                         /*alert("操作失败，请联系管理员！");*/
@@ -363,9 +379,15 @@
                                 '<span style="position: absolute;right: 9px;top: 85px;font-size: 12px;">'+ machineNo +'</span>' +
                                 '</div>');
                     }
+
                 }
                 $("#printlist").printArea();
                 $("#printlist").html("");
+                 if(${machineIsPrint} == '1')
+                 {
+                     updatePrint(machineBarcode, false);
+                     $("#" + machineBarcode).remove();
+                 }
             }
 
             /*获取产品信息*/

watero-rst-web/src/main/webapp/WEB-INF/views/pts/machine/producedAbnormalityStatistics.ftl

@@ -6,7 +6,7 @@
 <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
 <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no" />
 <meta http-equiv="Cache-Control" content="no-siteapp" />
-
+<#include "/base/list_base.ftl">
 <style>
 	.charts-box{width:500px;height:400px;display: inline-block;position: relative;margin-right: 40px;margin-bottom: 40px;}
 	.my-nav{width: 100%;height: 48px;background: #fff;display: table;text-align: center;}
@@ -15,7 +15,7 @@
 	.my-nav>a.active{background-color: #32a3d8;color:#fff;}
 </style>
 <title>生产统计</title>
-<#include "/base/list_base.ftl">
+
 </head>
 <body>
 <nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页 <span class="c-gray en">&gt;</span> 统计管理 <span class="c-gray en">&gt;</span> 生产统计 <a class="btn btn-success radius r mr-20" style="line-height:1.6em;margin-top:3px;background-color: #32a3d8;border: 1px solid #32a3d8;" href="javascript:location.replace(location.href);" title="刷新" ><i class="Hui-iconfont">&#xe68f;</i></a></nav>

watero-rst-web/src/main/webapp/WEB-INF/views/pts/machinePtras/parts_list.ftl

@@ -8,18 +8,18 @@
     <meta http-equiv="Cache-Control" content="no-siteapp" />
     <link rel="Bookmark" href="/favicon.ico" >
     <link rel="Shortcut Icon" href="/favicon.ico" />
-<#include "/base/list_base.ftl">
+    <#include "/base/list_base.ftl">
     <title>零件列表</title>
     <style>
         *{padding: 0;margin: 0;}
         .my-input{border: 1px solid rgba(0,0,0,.1);padding: 1px 5px;height: 32px;margin-right: 10px;}
         /*.my-input::-webkit-input-placeholder,.my-select{color: #dcdcdc;}*/
-        .my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(/common/images/pts/select-1.png) right center no-repeat;background-size:auto 100%;}
+        .my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/select-1.png) right center no-repeat;background-size:auto 100%;}
         .my-btn-search{border: 1px solid #32a3d8;padding: 1px 25px;height: 32px;background-color: #32a3d8;color: #fff;}
         .barcodeImg{margin:10px 0px}
         .table-bg thead th{background-color: #e2f6ff;}
-        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
-        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
     </style>
 </head>
 <body>

watero-rst-web/src/main/webapp/WEB-INF/views/pts/machinePtras/ptras_add.ftl

@@ -12,6 +12,17 @@
 <#include "/base/add_base.ftl">
     <link href="${path }/common/kingedit/themes/default/default.css" rel="stylesheet" type="text/css" />
 <title>添加机器零件</title>
+    <style>
+        *{padding: 0;margin: 0;}
+        .my-input{border: 1px solid rgba(0,0,0,.1);padding: 1px 5px;height: 32px;margin-right: 10px;}
+        /*.my-input::-webkit-input-placeholder,.my-select{color: #dcdcdc;}*/
+        .my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/select-1.png) right center no-repeat;background-size:auto 100%;}
+        .my-btn-search{border: 1px solid #32a3d8;padding: 1px 25px;height: 32px;background-color: #32a3d8;color: #fff;}
+        .barcodeImg{margin:10px 0px}
+        .table-bg thead th{background-color: #e2f6ff;}
+        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+    </style>
 </head>
 <body>
 <nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页
@@ -76,12 +87,15 @@
 
         <div class="row cl">
             <label class="form-label col-xs-4 col-sm-3"><span class="c-red">*</span>零件图片：</label>
-            <div class="formControls col-xs-8 col-sm-9" id="fileDiv">
+            <div class="formControls col-xs-3 col-sm-3" id="fileDiv" style="width: 17%;">
                 <input type="file" name="file" id="fileid" style="opacity: 0; position: absolute; width: 90px;height: 80px;">
                 <img alt="介绍图" src="${path}/common/images/pts/addparts.jpg" id="partsImg" width="90" height="80">
                 <input type="hidden" id="componentsImg" name="componentsImg" value=""/>
                 <#--<button type="button" class="btn" style="background: #32a3d8;color: #fff;-webkit-transform:translateY(-5%);" id="uploadSubmit"><i class="Hui-iconfont">&#xe665;</i> 上传</button>-->
             </div>
+            <div class="formControls col-xs-3 col-sm-3" style="height: 80px;">
+                <button type="button" style="cursor:pointer; float: left;margin-top: 48px" class="my-btn-search" onclick="addImage();">暂无图片</button>
+            </div>
         </div>
         <#--<div class="row cl">
             <label class="form-label col-xs-4 col-sm-2">缩略图：</label>
@@ -321,6 +335,15 @@
             }
         });
     }
+
+    /***
+     * 点击暂无图片，添加暂无图片的标识
+     */
+    function addImage(){
+        var image = root_path + "/common/images/pts/noImage.png";
+        $("#partsImg").attr("src",image);
+        $("#componentsImg").val("/common/images/pts/noImage.png");
+    }
 </script> 
 <!--/请在上方写此页面业务相关的脚本-->
 </body>

watero-rst-web/src/main/webapp/WEB-INF/views/pts/machineVersion/version_list.ftl

@@ -3,6 +3,7 @@
 	<head>
 		<meta charset="UTF-8">
 		<title>机器版本</title>
+	<#include "/base/list_base.ftl">
 <style>
 			article, section, time, aside {
 				display: block;
@@ -149,7 +150,7 @@
 }
 .center-midddle{position: absolute;top:50%;left: 0;-webkit-transform: translateY(-50%);transform: translateY(-50%);}
 		</style>
-	<#include "/base/list_base.ftl">
+
 	</head>
 	<body>
 		<ul class="list-main">

watero-rst-web/src/main/webapp/WEB-INF/views/pts/produce/produce_list.ftl

@@ -31,8 +31,8 @@
         .chanpin-list>.li-add:before{content: '';width: 5px;height: 80px; position: absolute;left: 50%;top: 90px;background-color: #32a3d8;border-radius: 50px;}
         .chanpin-list>.li-add:after{content: '';height: 5px;width: 80px;position: absolute;left: 75px;top: 128px;background-color: #32a3d8;border-radius: 50px;-webkit-transform:scaleX(1);}
         .chanpin-list>.li-add>div{display: table-cell;vertical-align: middle;height: 100%;width: 100%;text-align: center;color: #32a3d8;}
-        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
-        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
     </style>
 </head>
 <body>

watero-rst-web/src/main/webapp/WEB-INF/views/pts/produce/save_produce.ftl

@@ -21,10 +21,10 @@
         .add-list>li{margin: 10px 0;}
         .cp-list{list-style-type: none;margin: 0;padding: 0;}
         .cp-list>li{position: relative;    cursor: pointer;clear: both;padding: 15px 0;}
-        .my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(/common/images/pts/select-1.png) right center no-repeat;background-size:auto 100%;}
-        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
-        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
-        select{border: 1px solid rgba(0,0,0,.1);border-radius: 5px;padding:6px 35px 6px 5px;height: 32px;-webkit-appearance:none;appearance:none;background: url(/common/images/pts/select-1.png) right center no-repeat !important;background-size:auto 100% !important;margin-right: 10px;width: 85px;}
+        .my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/select-1.png) right center no-repeat;background-size:auto 100%;}
+        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        select{border: 1px solid rgba(0,0,0,.1);border-radius: 5px;padding:6px 35px 6px 5px;height: 32px;-webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/select-1.png) right center no-repeat !important;background-size:auto 100% !important;margin-right: 10px;width: 85px;}
     </style>
     <title>添加生产产品- 生产产品管理 - RST</title>
 </head>
@@ -34,72 +34,73 @@
     <span class="c-gray en">&gt;</span> 添加产品
     <a class="btn radius r" style="line-height:1.6em;margin-top:3px;background: #58d2ea;color: #fff;" href="javascript:location.replace(location.href);" title="刷新" ><i class="Hui-iconfont">&#xe68f;</i></a>
 </nav>
-<article class="page-container">
-    <form class="form form-horizontal" id="form-admin-addProduce">
-        <div style="padding: 10px;width: 600px;margin: 0 auto;" class="">
-            <div class="my-title">产品信息</div>
-            <div class="input-box"><span class="input-dic">产品名称</span><input class="my-input" name="produceName" id="produceName" type="text" value="" placeholder="请输入产品名称,2-20位字符" required   maxlength="20" minlength="2"/> </div>
-            <div class="input-box"><span class="input-dic">产品描述</span><input class="my-input" type="text" name="produceRemake" id="produceRemake" value="" placeholder="请输入产品描述,2-100位字符" required  maxlength="100" minlength="2"/> </div>
+<form class="form form-horizontal" id="form-admin-addProduce">
+    <article class="page-container" style="padding-bottom: 80px;">
 
-            <div class="input-box "><span class="input-dic">产品特性</span>
-                <select class="" style="width: 290px;" id="produceFeature" name="produceFeature">
-                    <option value="A" selected>国内(A)</option>
-                    <option value="B">美国(B)</option>
-                    <option value="C">欧洲(C)</option>
-                    <option value="D">其他(D)</option>
-                </select>
-            </div>
-            <div class="input-box"><span class="input-dic">产品型号</span><input class="my-input" style="width: 120px;" type="text" name="producePattern" id="producePattern" value="" placeholder="2-3位英文、数字组合" required  maxlength="3" minlength="2"/>-<input class="my-input" style="width: 120px;" type="text" name="produceModel" id="produceModel" value="" placeholder="2-3位英文、数字组合" required  maxlength="3" minlength="2"/>  </div>
+            <div style="padding: 10px;width: 600px;margin: 0 auto;" class="">
+                <div class="my-title">产品信息</div>
+                <div class="input-box"><span class="input-dic">产品名称</span><input class="my-input" name="produceName" id="produceName" type="text" value="" placeholder="请输入产品名称,2-20位字符" required   maxlength="20" minlength="2"/> </div>
+                <div class="input-box"><span class="input-dic">产品描述</span><input class="my-input" type="text" name="produceRemake" id="produceRemake" value="" placeholder="请输入产品描述,2-100位字符" required  maxlength="100" minlength="2"/> </div>
 
-            <div class="input-box"><span class="input-dic">产品类型</span>
-                <label><input type="radio" name="produceType" value="1" checked>净水机</label>
-                <label><input type="radio" name="produceType" value="2">冲奶机</label>
-            </div>
+                <div class="input-box "><span class="input-dic">产品特性</span>
+                    <select class="" style="width: 290px;" id="produceFeature" name="produceFeature">
+                        <option value="A" selected>国内(A)</option>
+                        <option value="B">美国(B)</option>
+                        <option value="C">欧洲(C)</option>
+                        <option value="D">其他(D)</option>
+                    </select>
+                </div>
+                <div class="input-box"><span class="input-dic">产品型号</span><input class="my-input" style="width: 120px;" type="text" name="producePattern" id="producePattern" value="" placeholder="1-3位英文、数字组合" required  maxlength="3" minlength="1"/>-<input class="my-input" style="width: 120px;" type="text" name="produceModel" id="produceModel" value="" placeholder="1-3位英文、数字组合" required  maxlength="3" minlength="1"/>  </div>
 
-            <div class="input-box"><span class="input-dic">产品状态</span>
-                <label><input type="radio" name="produceStatus" value="1" checked>正在使用</label>
-                <label><input type="radio" name="produceStatus" value="0">停止使用</label>
-            </div>
-            <div style="background-color:rgba(0,0,0,.1);height: 1px;margin: 15px 0;width: 93%;"></div>
+                <div class="input-box"><span class="input-dic">产品类型</span>
+                    <label><input type="radio" name="produceType" value="1" checked>净水机</label>
+                    <label><input type="radio" name="produceType" value="2">冲奶机</label>
+                </div>
 
-            <div class="my-title">节点信息</div>
+                <div class="input-box"><span class="input-dic">产品状态</span>
+                    <label><input type="radio" name="produceStatus" value="1" checked>正在使用</label>
+                    <label><input type="radio" name="produceStatus" value="0">停止使用</label>
+                </div>
+                <div style="background-color:rgba(0,0,0,.1);height: 1px;margin: 15px 0;width: 93%;"></div>
 
-            <ul class="cp-list onrTheProcess" id="sortable">
-                <li id="1" class="processList">
-                    <input type="hidden" class="processNumber" value="1">
-                    <div class="input-box pro-height">
-                        <span class="input-dic process-type process-sp">节点类型</span>
-                        <label><input type="radio" name="processType_p1" value="1" checked>生产工序</label>
-                        <label><input type="radio" name="processType_p1" value="2">修理工序</label>
-                        <button type="button" class="my-btn-edit" onclick="delProcess(this)">删除节点</button>
-                    </div>
-                    <div class="input-box"><span class="input-dic">节点名称</span><input class="my-input" name="processName" type="text" value="" placeholder="请输入节点名称,2-20位字符" required   maxlength="20" minlength="2"/> </div>
-                    <div class="input-box"><span class="input-dic">节点操作</span>
-                        <ul class="add-list oneTheNode" >
-                            <li class="nodeList">
-                                <#--<select class="my-select"><option>1</option></select>-->
-                                <label><input type="radio" name="nodeStatus_p1_n1" value="1" checked>正常</label>
-                                <label><input type="radio" name="nodeStatus_p1_n1" value="0">异常</label>
-                                <input class="my-input" name="nodeDes" type="text" value="" placeholder="请输入节点操作描述,2-20位字符" required minlength="2"   maxlength="20" />
-                                <i class="Hui-iconfont" onclick="delNode(this)">&#xe60b;</i>
-                            </li>
-                            <li>
-                                <button type="button" class="my-btn-edit" onclick="addProNode(this)">增加节点操作</button>
-                            </li>
-                        </ul>
-                    </div>
-                </li>
-            </ul>
+                <div class="my-title">节点信息</div>
 
-            <div style="clear: both;"></div>
-            <div style="padding-top: 15px;"><button type="button" class="my-btn-edit" onclick="addProcess(this)">增加节点</button></div>
-            <div>
-                <button type="reset" class="my-btn-reset" >重置</button><button type="submit" class="my-btn-submit">确认提交</button>
+                <ul class="cp-list onrTheProcess" id="sortable">
+                    <li id="1" class="processList">
+                        <input type="hidden" class="processNumber" value="1">
+                        <div class="input-box pro-height">
+                            <span class="input-dic process-type process-sp">节点类型</span>
+                            <label><input type="radio" name="processType_p1" value="1" checked>生产工序</label>
+                            <label><input type="radio" name="processType_p1" value="2">修理工序</label>
+                            <button type="button" class="my-btn-edit" onclick="delProcess(this)">删除节点</button>
+                        </div>
+                        <div class="input-box"><span class="input-dic">节点名称</span><input class="my-input" name="processName" type="text" value="" placeholder="请输入节点名称,2-20位字符" required   maxlength="20" minlength="2"/> </div>
+                        <div class="input-box"><span class="input-dic">节点操作</span>
+                            <ul class="add-list oneTheNode" >
+                                <li class="nodeList">
+                                    <#--<select class="my-select"><option>1</option></select>-->
+                                    <label><input type="radio" name="nodeStatus_p1_n1" value="1" checked>正常</label>
+                                    <label><input type="radio" name="nodeStatus_p1_n1" value="0">异常</label>
+                                    <input class="my-input" name="nodeDes" type="text" value="" placeholder="请输入节点操作描述,2-20位字符" required minlength="2"   maxlength="20" />
+                                    <i class="Hui-iconfont" onclick="delNode(this)">&#xe60b;</i>
+                                </li>
+                                <li>
+                                    <button type="button" class="my-btn-edit" onclick="addProNode(this)">增加节点操作</button>
+                                </li>
+                            </ul>
+                        </div>
+                    </li>
+                </ul>
+
+                <div style="clear: both;"></div>
+                <div style="padding-top: 15px;"><button type="button" class="my-btn-edit" onclick="addProcess(this)">增加节点</button></div>
             </div>
-        </div>
+    </article>
 
-    </form>
-</article>
+        <div style="width: 100%;height: 80px;position: fixed;bottom: 0px;background: #f5f5f5;text-align: center;line-height: 80px;">
+            <button type="reset" class="my-btn-reset" >重置</button><button type="submit" class="my-btn-submit">确认提交</button>
+        </div>
+</form>
 <#--<script type="text/javascript" src="${path}/common/lib/ueditor/1.4.3/ueditor.config.js"></script>-->
 <#--<script type="text/javascript" src="${path}/common/lib/ueditor/1.4.3/ueditor.all.js"></script>-->
 <script type="text/javascript" src="${path}/common/lib/jquery.ui/jquery-ui.js"></script>

watero-rst-web/src/main/webapp/WEB-INF/views/pts/produce/update_produce.ftl

@@ -6,7 +6,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no" />
     <meta http-equiv="Cache-Control" content="no-siteapp" />
-<#include "/base/add_base.ftl">
+    <#include "/base/add_base.ftl">
     <link href="${path}/common/lib/jquery.ui/jquery-ui.css" rel="stylesheet" type="text/css" />
     <style>
         .my-title{font-weight: 500;padding-left: 15px;position: relative;}
@@ -21,10 +21,10 @@
         .add-list>li{margin: 10px 0;}
         .cp-list{list-style-type: none;margin: 0;padding: 0;}
         .cp-list>li{position: relative;    cursor: pointer;clear: both;padding: 15px 0;}
-        .my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(/common/images/pts/select-1.png) right center no-repeat;background-size:auto 100%;}
-        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
-        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
-        select{border: 1px solid rgba(0,0,0,.1);border-radius: 5px;padding:6px 35px 6px 5px;height: 32px;-webkit-appearance:none;appearance:none;background: url(/common/images/pts/select-1.png) right center no-repeat !important;background-size:auto 100% !important;margin-right: 10px;width: 85px;}
+        .my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/select-1.png) right center no-repeat;background-size:auto 100%;}
+        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        select{border: 1px solid rgba(0,0,0,.1);border-radius: 5px;padding:6px 35px 6px 5px;height: 32px;-webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/select-1.png) right center no-repeat !important;background-size:auto 100% !important;margin-right: 10px;width: 85px;}
     </style>
     <title>修改生产产品- 生产产品管理 - RST</title>
 </head>
@@ -34,8 +34,8 @@
     <span class="c-gray en">&gt;</span> 修改产品
     <a class="btn radius r" style="line-height:1.6em;margin-top:3px;background: #58d2ea;color: #fff;" href="javascript:location.replace(location.href);" title="刷新" ><i class="Hui-iconfont">&#xe68f;</i></a>
 </nav>
-<article class="page-container">
-    <form class="form form-horizontal" id="form-admin-addProduce">
+<form class="form form-horizontal" id="form-admin-addProduce">
+    <article class="page-container" style="padding-bottom: 80px;">
         <div style="padding: 10px;width: 600px;margin: 0 auto;" class="">
             <div class="my-title">产品信息</div>
             <input type="hidden" name="produceId" value="${produce.produceId!}">
@@ -50,8 +50,8 @@
                     <option value ="D" <#if produce.produceFeature??><#if produce.produceFeature == 'D'>selected="selected"</#if></#if>>其他(D)</option>
                 </select>
             </div>
-            <div class="input-box"><span class="input-dic">产品型号</span><input class="my-input" style="width: 120px;" type="text" name="producePattern" id="producePattern" placeholder="2-3位英文、数字组合" value="${produce.producePattern!}" placeholder="" required  maxlength="3" minlength="2"/>-
-                <input class="my-input" style="width: 120px;" type="text" name="produceModel" id="produceModel" value="${produce.produceModel!}" placeholder="2-3位英文、数字组合" required  maxlength="3" minlength="2"/>  </div>
+            <div class="input-box"><span class="input-dic">产品型号</span><input class="my-input" style="width: 120px;" type="text" name="producePattern" id="producePattern" placeholder="1-3位英文、数字组合" value="${produce.producePattern!}" placeholder="" required  maxlength="3" minlength="1"/>-
+                <input class="my-input" style="width: 120px;" type="text" name="produceModel" id="produceModel" value="${produce.produceModel!}" placeholder="1-3位英文、数字组合" required  maxlength="3" minlength="1"/>  </div>
 
             <div class="input-box"><span class="input-dic">产品类型</span>
                 <label><input type="radio" name="produceType" value="1" <#if produce.produceType == 1>checked</#if>>净水机</label>
@@ -99,16 +99,15 @@
 
             <div style="clear: both;"></div>
             <div style="padding-top: 15px;"><button type="button" class="my-btn-edit" onclick="addProcess(this)">增加节点</button></div>
-
-            <div style="color: red; margin: 10px;">*说明：如果机器正在生产，请不要修改，待生成完成以后修改；如果信息有误，请联系深圳技术部协助处理。</div>
-            <div>
-
-                <button type="submit" class="my-btn-submit">确认提交</button>
-            </div>
         </div>
+    </article>
+
 
-    </form>
-</article>
+    <div style="width: 100%;height: 80px;position: fixed;bottom: 0px;background: #f5f5f5;text-align: center;">
+        <span style="color: red; margin: 10px;display: block;margin: 0 auto;width:700px;padding-top: 5px;">*说明：如果机器正在生产，请不要修改，待生成完成以后修改；如果信息有误，请联系深圳技术部协助处理。</span>
+        <div><button type="submit" class="my-btn-submit">确认提交</button></div>
+    </div>
+</form>
 <#--<script type="text/javascript" src="${path}/common/lib/ueditor/1.4.3/ueditor.config.js"></script>-->
 <#--<script type="text/javascript" src="${path}/common/lib/ueditor/1.4.3/ueditor.all.js"></script>-->
 <script type="text/javascript" src="${path}/common/lib/jquery.ui/jquery-ui.js"></script>

watero-rst-web/src/main/webapp/WEB-INF/views/pts/supplier/add_supplier.ftl

@@ -7,12 +7,12 @@
     <meta name="viewport"
           content="width=device-width,initial-scale=1,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no"/>
     <meta http-equiv="Cache-Control" content="no-siteapp"/>
-<#include "/base/add_base.ftl">
+    <#include "/base/add_base.ftl">
     <link href="${path}/common/lib/jquery.ui/jquery-ui.css" rel="stylesheet" type="text/css"/>
     <style>
         .add-list>li{margin: 10px 0;}
-        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
-        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
     </style>
     <title>添加供应商 - 供应商管理 - RST</title>
 </head>

watero-rst-web/src/main/webapp/WEB-INF/views/pts/supplier/supplier_list.ftl

@@ -8,18 +8,18 @@
     <meta http-equiv="Cache-Control" content="no-siteapp" />
     <link rel="Bookmark" href="/favicon.ico" >
     <link rel="Shortcut Icon" href="/favicon.ico" />
-<#include "/base/list_base.ftl">
+    <#include "/base/list_base.ftl">
     <title>供应商列表</title>
     <style>
         *{padding: 0;margin: 0;}
         .my-input{border: 1px solid rgba(0,0,0,.1);padding: 1px 5px;height: 32px;margin-right: 10px;}
         /*.my-input::-webkit-input-placeholder,.my-select{color: #dcdcdc;}*/
-        .my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(/common/images/pts/select-1.png) right center no-repeat;background-size:auto 100%;}
+        .my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/select-1.png) right center no-repeat;background-size:auto 100%;}
         .my-btn-search{border: 1px solid #32a3d8;padding: 1px 25px;height: 32px;background-color: #32a3d8;color: #fff;}
         .barcodeImg{margin:10px 0px}
         .table-bg thead th{background-color: #e2f6ff;}
-        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
-        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
     </style>
 </head>
 <body>

watero-rst-web/src/main/webapp/WEB-INF/views/pts/supplier/update_supplier.ftl

@@ -7,12 +7,12 @@
     <meta name="viewport"
           content="width=device-width,initial-scale=1,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no"/>
     <meta http-equiv="Cache-Control" content="no-siteapp"/>
-<#include "/base/add_base.ftl">
+    <#include "/base/add_base.ftl">
     <link href="${path}/common/lib/jquery.ui/jquery-ui.css" rel="stylesheet" type="text/css"/>
     <style>
         .add-list>li{margin: 10px 0;}
-        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
-        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
     </style>
     <title>修改供应商 - 供应商管理 - RST</title>
 </head>

watero-rst-web/src/main/webapp/WEB-INF/views/sys/add_admin.ftl

@@ -11,8 +11,8 @@
     <meta name="keywords" content="${path}">
     <meta name="description" content="H-ui.admin v3.0，是一款由国人开发的轻量级扁平化网站后台模板，完全免费开源的网站后台管理系统模版，适合中小型CMS后台系统。">
     <style>
-        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
-        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
     </style>
 </head>
 <body>

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

@@ -58,3 +58,73 @@ function Trim(str)
     return str.replace(/\s+/g, "");
 }
 
+/**
+ * 获取省
+ */
+function listProvince(){
+    var province = {};
+    $.ajax({
+        type: "get",
+        data: {
+        },
+        url: root_path +"/address/list_province",
+        async: false,
+        success: function(data){
+            if (data.returnCode == 200) {
+                province = data.returnMsg.provinceList;
+            }else{
+                console.log("查询失败");
+            }
+        },
+        error: function(XmlHttpRequest, textStatus, errorThrown){
+        }
+    });
+}
+
+/**
+ * 获取市
+ */
+function listCity(provinceId){
+    var city = {};
+    $.ajax({
+        type: "get",
+        data: {
+            provinceId : provinceId
+        },
+        url: root_path +"/address/list_city",
+        async: false,
+        success: function(data){
+            if (data.returnCode == 200) {
+                city = data.returnMsg.cityList;
+            }else{
+                console.log("查询失败");
+            }
+        },
+        error: function(XmlHttpRequest, textStatus, errorThrown){
+        }
+    });
+}
+
+/**
+ * 获取区
+ */
+function listDistrict(cityId){
+    var district = {};
+    $.ajax({
+        type: "get",
+        data: {
+            cityId : cityId
+        },
+        url: root_path +"/address/list_district",
+        async: false,
+        success: function(data){
+            if (data.returnCode == 200) {
+                district = data.returnMsg.cityList;
+            }else{
+                console.log("查询失败");
+            }
+        },
+        error: function(XmlHttpRequest, textStatus, errorThrown){
+        }
+    });
+}