From 05088abb136d2aede56f25aaa6ec68016bbce935 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期六, 02 八月 2025 18:04:41 +0800
Subject: [PATCH] 新增加价格配置模块

---
 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSystemPrice.java                             |   33 
 ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/systemPriceCity_add.html                           |   65 ++
 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/BaseBean.java                                 |  107 +++
 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TServerCarmodel.java                          |   31 
 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ISystemPriceCityService.java                |   25 
 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/SystemPriceCityServiceImpl.java        |   39 +
 ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tSystemPrice/tSystemPrice_info.js                             |   26 
 ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/systemPriceCity_edit.html                          |   78 ++
 ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/systemPriceCity.html                               |   48 +
 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TSystemPriceController.java |  314 +++++++--
 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/SystemPriceCityMapper.xml               |   17 
 ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tSystemPrice/systemPriceCity_info.js                          |  262 ++++++++
 ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tSystemPrice/systemPriceCity.js                               |  154 +++++
 ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/taxiSet.html                                       |   26 
 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/SystemPriceCity.java                          |   44 +
 ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/tSystemPrice_edit.html                             |  480 +++++++--------
 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/SystemPriceCityMapper.java                      |   27 
 ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/tSystemPrice_add.html                              |    5 
 18 files changed, 1,395 insertions(+), 386 deletions(-)

diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TSystemPriceController.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TSystemPriceController.java
index 23df0e6..53eebf1 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TSystemPriceController.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TSystemPriceController.java
@@ -1,5 +1,8 @@
 package com.stylefeng.guns.modular.system.controller.specialTrain;
 
+import cn.hutool.core.codec.Base64;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.stylefeng.guns.core.base.controller.BaseController;
@@ -8,11 +11,12 @@
 import com.stylefeng.guns.core.common.constant.factory.PageFactory;
 import com.stylefeng.guns.core.log.LogObjectHolder;
 import com.stylefeng.guns.core.util.SinataUtil;
+import com.stylefeng.guns.core.util.ToolUtil;
+import com.stylefeng.guns.modular.system.model.SystemPriceCity;
+import com.stylefeng.guns.modular.system.model.TRegion;
 import com.stylefeng.guns.modular.system.model.TServerCarmodel;
 import com.stylefeng.guns.modular.system.model.TSystemPrice;
-import com.stylefeng.guns.modular.system.service.ITServerCarmodelService;
-import com.stylefeng.guns.modular.system.service.ITSystemPriceService;
-import com.stylefeng.guns.modular.system.service.IUserService;
+import com.stylefeng.guns.modular.system.service.*;
 import com.stylefeng.guns.modular.system.util.PushMinistryOfTransportUtil;
 import com.stylefeng.guns.modular.system.util.ResultUtil;
 import net.sf.json.JSONObject;
@@ -28,6 +32,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 /**
@@ -52,19 +57,82 @@
     private PushMinistryOfTransportUtil pushMinistryOfTransportUtil;
     
     @Autowired
-    private IUserService userService;
+    private ITRegionService tRegionService;
     @Autowired
     private ShiroExtUtil shiroExtUtil;
     
     @Value("${pushMinistryOfTransport}")
     private boolean pushMinistryOfTransport;
     
+    @Autowired
+    private ISystemPriceCityService systemPriceCityService;
+    
+    
+    /**
+     * 跳转到列表页
+     * @return
+     */
+    @RequestMapping("/showSystemPriceCity")
+    public String showSystemPriceCity(){
+        return PREFIX + "systemPriceCity.html";
+    }
+    
+    /**
+     * 跳转到添加价格
+     * @return
+     */
+    @RequestMapping("/systemPriceCity_add")
+    public String systemPriceCity_add(Model model){
+        List<TServerCarmodel> tServerCarmodels = tServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 1).eq("state", 1));
+        model.addAttribute("serverCarModelList", tServerCarmodels);
+        List<TRegion> provinceList = tRegionService.selectList(new EntityWrapper<TRegion>().eq("parent_id", 0));
+        model.addAttribute("provinceList",provinceList);
+        return PREFIX + "systemPriceCity_add.html";
+    }
+    
+    /**
+     * 跳转到修改价格城市
+     * @return
+     */
+    @RequestMapping("/systemPriceCity_update")
+    public String systemPriceCity_update(Integer id, Model model){
+        SystemPriceCity systemPriceCity = systemPriceCityService.selectById(id);
+        model.addAttribute("item", systemPriceCity);
+        //省
+        List<TRegion> provinceList = tRegionService.selectList(new EntityWrapper<TRegion>().eq("parent_id", 0));
+        model.addAttribute("provinceList",provinceList);
+        //市
+        TRegion code = tRegionService.selectOne(new EntityWrapper<TRegion>().eq("code", systemPriceCity.getAreaCode()));
+        List<TRegion> cityList = tRegionService.selectList(new EntityWrapper<TRegion>().eq("parent_id", code.getId()));
+        model.addAttribute("cityList",cityList);
+        //区
+        model.addAttribute("areaList", null);
+        if(ToolUtil.isNotEmpty(systemPriceCity.getProvinceCode())){
+            code = tRegionService.selectOne(new EntityWrapper<TRegion>().eq("code", systemPriceCity.getCityCode()));
+            List<TRegion> areaList = tRegionService.selectList(new EntityWrapper<TRegion>().eq("parent_id", code.getId()));
+            model.addAttribute("areaList",areaList);
+        }
+        List<TServerCarmodel> tServerCarmodels = tServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 1).eq("state", 1));
+        List<TSystemPrice> tSystemPrices = tSystemPriceService.selectList(new EntityWrapper<TSystemPrice>().eq("systemPriceCityId", id).eq("state", 1).eq("type", 1));
+        tServerCarmodels.forEach(s->{
+            Optional<TSystemPrice> first = tSystemPrices.stream().filter(p -> p.getServerCarModelId().equals(s.getId())).findFirst();
+            if(first.isPresent()){
+                TSystemPrice tSystemPrice = first.get();
+                s.setObject(Base64.encode(JSON.toJSONString(tSystemPrice)));
+            }
+        });
+        model.addAttribute("serverCarModelList", tServerCarmodels);
+        TSystemPrice systemPrice = tSystemPriceService.selectOne(new EntityWrapper<TSystemPrice>().eq("systemPriceCityId", id).eq("state", 1).eq("type", 2));
+        model.addAttribute("zcPrice", Base64.encode(systemPrice.getContent()));
+        return PREFIX + "systemPriceCity_edit.html";
+    }
+    
     
     /**
      * 跳转到快车价格设置首页
      */
     @RequestMapping("/special")
-    public String index() {
+    public String index(Integer id) {
         return PREFIX + "tSystemPrice.html";
     }
 
@@ -91,11 +159,10 @@
 
 
      @RequestMapping("/taxi")
-    public String taxi(Model model) {
-         Integer id = shiroExtUtil.getUser().getId();
-         TSystemPrice one = tSystemPriceService.selectOne(new EntityWrapper<TSystemPrice>().eq("type", 2).eq("companyId", id));
-         if (SinataUtil.isNotEmpty(one)) {
-             JSONObject json1 = JSONObject.fromObject(one.getContent());
+    public String taxi(String price, Model model) {
+         if(ToolUtil.isNotEmpty(price)){
+             price = Base64.decodeStr(price);
+             JSONObject json1 = JSONObject.fromObject(price);
              model.addAttribute("json", json1);
          }
          return PREFIX + "taxiSet.html";
@@ -104,25 +171,39 @@
      * 跳转到添加快车价格设置
      */
     @RequestMapping("/tSystemPrice_add")
-    public String tSystemPriceAdd(Model model) {
-        //查询所有快车车型
-        List<TSystemPrice> tSystemPrices = tSystemPriceService.selectList(new EntityWrapper<TSystemPrice>().eq("type", 1).eq("companyId", shiroExtUtil.getUser().getObjectId()).ne("state", 3));
-        List<TServerCarmodel> modelList = tServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 1).eq("state", 1));
-        List<TServerCarmodel> serverCarmodels = new ArrayList<>();
-        for (TServerCarmodel tsc : modelList) {
-            boolean b = true;
-            for (TSystemPrice tsp : tSystemPrices) {
-                if (tsc.getId() == tsp.getServerCarModelId()) {
-                    b = false;
-                    break;
-                }
-            }
-            if (b) {
-                serverCarmodels.add(tsc);
-            }
+    public String tSystemPriceAdd(Integer id, String price, Model model) {
+        model.addAttribute("item", null);
+        model.addAttribute("content", null);
+        model.addAttribute("contentPutOne", null);
+        model.addAttribute("contentNotOne", null);
+        model.addAttribute("contentPutTwo", null);
+        model.addAttribute("contentNotTwo", null);
+        model.addAttribute("contentPutThree", null);
+        model.addAttribute("contentNotThree", null);
+        model.addAttribute("contentExclusive", null);
+        model.addAttribute("contentPrice", null);
+        if(ToolUtil.isNotEmpty(price)){
+            String s = Base64.decodeStr(price);
+            TSystemPrice tSystemPrice = JSON.parseObject(s, TSystemPrice.class);
+            model.addAttribute("item",tSystemPrice);
+            LogObjectHolder.me().set(tSystemPrice);
+    
+            JSONObject json = JSONObject.fromObject(tSystemPrice.getContent());
+            model.addAttribute("content",json);
+    
+            model.addAttribute("contentPutOne", JSONObject.fromObject(tSystemPrice.getContentPutOne()));
+            model.addAttribute("contentNotOne", JSONObject.fromObject(tSystemPrice.getContentNotOne()));
+            model.addAttribute("contentPutTwo", JSONObject.fromObject(tSystemPrice.getContentPutTwo()));
+            model.addAttribute("contentNotTwo", JSONObject.fromObject(tSystemPrice.getContentNotTwo()));
+            model.addAttribute("contentPutThree", JSONObject.fromObject(tSystemPrice.getContentPutThree()));
+            model.addAttribute("contentNotThree", JSONObject.fromObject(tSystemPrice.getContentNotThree()));
+            model.addAttribute("contentExclusive", JSONObject.fromObject(tSystemPrice.getContentExclusive()));
+            model.addAttribute("contentPrice", JSONObject.fromObject(tSystemPrice.getContentPrice()));
         }
-        model.addAttribute("modelList",serverCarmodels);
-        return PREFIX + "tSystemPrice_add.html";
+        
+        TServerCarmodel tServerCarmodel = tServerCarmodelService.selectById(id);
+        model.addAttribute("modelList", tServerCarmodel);
+        return PREFIX + "tSystemPrice_edit.html";
     }
 
     /**
@@ -167,7 +248,25 @@
 
         return PREFIX + "tSystemPrice_edit.html";
     }
-
+    
+    
+    /**
+     * 获取价格列表设置
+     * @param name
+     * @param time
+     * @return
+     */
+    @RequestMapping(value = "/queryList")
+    @ResponseBody
+    public Object queryList(String condition, String insertTime){
+        Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
+        page.setRecords(systemPriceCityService.queryList(page, condition, insertTime));
+        return super.packForBT(page);
+        
+    }
+    
+    
+    
     /**
      * 获取快车价格设置列表
      */
@@ -184,29 +283,58 @@
      */
     @RequestMapping(value = "/add")
     @ResponseBody
-    public Object add(TSystemPrice tSystemPrice) {
-        //判断当前公司是否添加过该快车车型价格配置
-        int count = tSystemPriceService.selectCount(new EntityWrapper<TSystemPrice>()
-                .eq("type", 1)
-                .eq("serverCarModelId", tSystemPrice.getServerCarModelId())
-                .eq("companyId", shiroExtUtil.getUser().getObjectId())
-                .last(" and not FIND_IN_SET(state,'3')"));
-        if (count > 0) {
-            TServerCarmodel one = tServerCarmodelService.selectById(tSystemPrice.getServerCarModelId());
-            return new ErrorTip(500, "【" + one.getName() + "】已存在,请重新选择");
+    public Object add(SystemPriceCity systemPriceCity, String zcPrice, String czcPrice) {
+        if(ToolUtil.isNotEmpty(systemPriceCity.getProvinceCode())){
+            TRegion tRegion = tRegionService.selectById(systemPriceCity.getProvinceCode());
+            systemPriceCity.setProvinceCode(tRegion.getCode());
         }
-        tSystemPrice.setCompanyId(shiroExtUtil.getUser().getObjectId());
-        tSystemPrice.setType(1);
+        if(ToolUtil.isNotEmpty(systemPriceCity.getCityCode())){
+            TRegion tRegion = tRegionService.selectById(systemPriceCity.getCityCode());
+            systemPriceCity.setCityCode(tRegion.getCode());
+        }
+        if(ToolUtil.isNotEmpty(systemPriceCity.getAreaCode())){
+            TRegion tRegion = tRegionService.selectById(systemPriceCity.getAreaCode());
+            systemPriceCity.setAreaCode(tRegion.getCode());
+        }
+        
+        
+        SystemPriceCity one = null;
+        if(null != systemPriceCity.getProvinceCode()){
+            one = systemPriceCityService.selectOne(new EntityWrapper<SystemPriceCity>().eq("areaCode", systemPriceCity.getAreaCode())
+                    .eq("cityCode", systemPriceCity.getCityCode()).eq("provinceCode", systemPriceCity.getProvinceCode()).ne("flag", 3));
+        }
+        if(null == one){
+            one = systemPriceCityService.selectOne(new EntityWrapper<SystemPriceCity>().eq("areaCode", systemPriceCity.getAreaCode())
+                    .eq("cityCode", systemPriceCity.getCityCode()).ne("flag", 3));
+            if(null == one){
+                one = systemPriceCityService.selectOne(new EntityWrapper<SystemPriceCity>().eq("areaCode", systemPriceCity.getAreaCode())
+                        .ne("flag", 3));
+                if(null != one){
+                    return new ErrorTip(500, "不能重复添加城市");
+                }
+            }else{
+                return new ErrorTip(500, "不能重复添加城市");
+            }
+        }else{
+            return new ErrorTip(500, "不能重复添加城市");
+        }
+        systemPriceCityService.insert(systemPriceCity);
+        //解析专车的价格配置
+        JSONArray jsonArray = JSON.parseArray(zcPrice);
+        for (int i = 0; i < jsonArray.size(); i++) {
+            TSystemPrice tSystemPrice = jsonArray.getObject(i, TSystemPrice.class);
+            tSystemPrice.setSystemPriceCityId(systemPriceCity.getId());
+            tSystemPrice.setType(1);
+            tSystemPrice.setState(1);
+            tSystemPriceService.insert(tSystemPrice);
+        }
+        //解析出出租车价格设置
+        TSystemPrice tSystemPrice = new TSystemPrice();
+        tSystemPrice.setContent(czcPrice);
+        tSystemPrice.setSystemPriceCityId(systemPriceCity.getId());
+        tSystemPrice.setType(2);
         tSystemPrice.setState(1);
         tSystemPriceService.insert(tSystemPrice);
-        new Thread(new Runnable() {
-            @Override
-            public void run() {
-                if (pushMinistryOfTransport) {//上传数据
-                    pushMinistryOfTransportUtil.baseInfoCompanyFare(tSystemPrice.getId());
-                }
-            }
-        }).start();
         return SUCCESS_TIP;
     }
 
@@ -219,7 +347,6 @@
             TSystemPrice tSystemPrice = new TSystemPrice();
             tSystemPrice.setContent(content);
             tSystemPrice.setType(2);
-            tSystemPrice.setCompanyId(id);
             tSystemPriceService.insert(tSystemPrice);
         } else {
             tSystemPrice1.setContent(content);
@@ -234,29 +361,60 @@
      */
     @RequestMapping(value = "/update")
     @ResponseBody
-    public Object update(TSystemPrice tSystemPrice) {
-        TSystemPrice obj = tSystemPriceService.selectById(tSystemPrice.getId());
-        if (obj.getServerCarModelId() != tSystemPrice.getServerCarModelId()){
-            //判断当前公司是否添加过该快车车型价格配置
-            int count = tSystemPriceService.selectCount(new EntityWrapper<TSystemPrice>()
-                    .eq("type", 1)
-                    .eq("serverCarModelId", tSystemPrice.getServerCarModelId())
-                    .eq("companyId", shiroExtUtil.getUser().getObjectId())
-                    .last(" and not FIND_IN_SET(state,'3')"));
-            if (count > 0){
-                TServerCarmodel one = tServerCarmodelService.selectById(tSystemPrice.getServerCarModelId());
-                return new ErrorTip(500, "【"+one.getName()+"】已存在,请重新选择");
-            }
+    public Object update(SystemPriceCity systemPriceCity, String zcPrice, String czcPrice) {
+        if(ToolUtil.isNotEmpty(systemPriceCity.getProvinceCode())){
+            TRegion tRegion = tRegionService.selectById(systemPriceCity.getProvinceCode());
+            systemPriceCity.setProvinceCode(tRegion.getCode());
         }
-        tSystemPriceService.updateById(tSystemPrice);
-        new Thread(new Runnable() {
-            @Override
-            public void run() {
-                if(pushMinistryOfTransport) {//上传数据
-                    pushMinistryOfTransportUtil.baseInfoCompanyFare(tSystemPrice.getId());
+        if(ToolUtil.isNotEmpty(systemPriceCity.getCityCode())){
+            TRegion tRegion = tRegionService.selectById(systemPriceCity.getCityCode());
+            systemPriceCity.setCityCode(tRegion.getCode());
+        }
+        if(ToolUtil.isNotEmpty(systemPriceCity.getAreaCode())){
+            TRegion tRegion = tRegionService.selectById(systemPriceCity.getAreaCode());
+            systemPriceCity.setAreaCode(tRegion.getCode());
+        }
+    
+    
+        SystemPriceCity one = null;
+        if(null != systemPriceCity.getProvinceCode()){
+            one = systemPriceCityService.selectOne(new EntityWrapper<SystemPriceCity>().eq("areaCode", systemPriceCity.getAreaCode())
+                    .eq("cityCode", systemPriceCity.getCityCode()).eq("provinceCode", systemPriceCity.getProvinceCode()).ne("flag", 3));
+        }
+        if(null == one){
+            one = systemPriceCityService.selectOne(new EntityWrapper<SystemPriceCity>().eq("areaCode", systemPriceCity.getAreaCode())
+                    .eq("cityCode", systemPriceCity.getCityCode()).ne("flag", 3));
+            if(null == one){
+                one = systemPriceCityService.selectOne(new EntityWrapper<SystemPriceCity>().eq("areaCode", systemPriceCity.getAreaCode())
+                        .ne("flag", 3));
+                if(null != one && !systemPriceCity.getId().equals(one.getId())){
+                    return new ErrorTip(500, "不能重复添加城市");
                 }
+            }else if(!systemPriceCity.getId().equals(one.getId())){
+                return new ErrorTip(500, "不能重复添加城市");
             }
-        }).start();
+        }else if(!systemPriceCity.getId().equals(one.getId())){
+            return new ErrorTip(500, "不能重复添加城市");
+        }
+        systemPriceCityService.updateById(systemPriceCity);
+        //删除历史数据
+        tSystemPriceService.delete(new EntityWrapper<TSystemPrice>().eq("systemPriceCityId", systemPriceCity.getId()));
+        //解析专车的价格配置
+        JSONArray jsonArray = JSON.parseArray(zcPrice);
+        for (int i = 0; i < jsonArray.size(); i++) {
+            TSystemPrice tSystemPrice = jsonArray.getObject(i, TSystemPrice.class);
+            tSystemPrice.setSystemPriceCityId(systemPriceCity.getId());
+            tSystemPrice.setType(1);
+            tSystemPrice.setState(1);
+            tSystemPriceService.insert(tSystemPrice);
+        }
+        //解析出出租车价格设置
+        TSystemPrice tSystemPrice = new TSystemPrice();
+        tSystemPrice.setContent(czcPrice);
+        tSystemPrice.setSystemPriceCityId(systemPriceCity.getId());
+        tSystemPrice.setType(2);
+        tSystemPrice.setState(1);
+        tSystemPriceService.insert(tSystemPrice);
         return SUCCESS_TIP;
     }
 
@@ -265,16 +423,10 @@
      */
     @RequestMapping(value = "/opt")
     @ResponseBody
-    public Object opt(Integer optType,Integer tSystemPriceId) {
-        TSystemPrice systemPrice = new TSystemPrice();
-        if (1 == optType){  //冻结
-            systemPrice.setState(2);
-        }else if (2 == optType){  //解冻
-            systemPrice.setState(1);
-        }else if (3 == optType){  //删除
-            systemPrice.setState(3);
-        }
-        tSystemPriceService.update(systemPrice,new EntityWrapper<TSystemPrice>().eq("id",tSystemPriceId));
+    public Object opt(Integer id) {
+        SystemPriceCity systemPriceCity = systemPriceCityService.selectById(id);
+        systemPriceCity.setFlag(3);
+        systemPriceCityService.updateById(systemPriceCity);
         return SUCCESS_TIP;
     }
 
@@ -293,7 +445,6 @@
             one = new TSystemPrice();
             one.setState(1);
             one.setType(5);
-            one.setCompanyId(shiroExtUtil.getUser().getObjectId());
             one.setContent(json1);
             tSystemPriceService.insert(one);
         }
@@ -306,7 +457,6 @@
             two = new TSystemPrice();
             two.setState(1);
             two.setType(4);
-            two.setCompanyId(shiroExtUtil.getUser().getObjectId());
             two.setContent(json2);
             tSystemPriceService.insert(two);
         }
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/SystemPriceCityMapper.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/SystemPriceCityMapper.java
new file mode 100644
index 0000000..0b7502f
--- /dev/null
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/SystemPriceCityMapper.java
@@ -0,0 +1,27 @@
+package com.stylefeng.guns.modular.system.dao;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.SystemPriceCity;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author zhibing.pu
+ * @Date 2025/7/26 9:24
+ */
+public interface SystemPriceCityMapper extends BaseMapper<SystemPriceCity> {
+	
+	/**
+	 * 获取列表数据
+	 * @param page
+	 * @param name
+	 * @param start
+	 * @param end
+	 * @return
+	 */
+	List<Map<String, Object>> queryList(Page<Map<String, Object>> page, @Param("name") String name,
+	                                    @Param("start") String start, @Param("end") String end);
+}
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/SystemPriceCityMapper.xml b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/SystemPriceCityMapper.xml
new file mode 100644
index 0000000..d5ca0d1
--- /dev/null
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/SystemPriceCityMapper.xml
@@ -0,0 +1,17 @@
+<?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.stylefeng.guns.modular.system.dao.SystemPriceCityMapper">
+	
+	
+	<select id="queryList" resultType="java.util.Map">
+		select * from t_system_price_city where flag != 3
+		<if test="null != name and '' != name">
+			and (areaName like concat('%',#{name},'%') or cityName like concat('%',#{name},'%') or provinceName like
+			concat('%',#{name},'%'))
+		</if>
+		<if test="null != start and '' != start and null != end and '' != end">
+			and DATE_FORMAT(insertTime,'%Y-%m-%d') between #{start} and #{end}
+		</if>
+		order by insertTime desc
+	</select>
+</mapper>
\ No newline at end of file
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/BaseBean.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/BaseBean.java
new file mode 100644
index 0000000..a11c39e
--- /dev/null
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/BaseBean.java
@@ -0,0 +1,107 @@
+package com.stylefeng.guns.modular.system.model;
+
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.enums.IdType;
+
+import java.util.Date;
+
+public class BaseBean {
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    @TableField("id")
+    private Integer id;
+    /**
+     * 1：正常，2：停用，3：删除
+     */
+    @TableField("flag")
+    private Integer flag;
+    /**
+     * 添加时间
+     */
+    @TableField("insertTime")
+    private Date insertTime;
+    /**
+     * 添加人员
+     */
+    @TableField("insertUser")
+    private Integer insertUser;
+    /**
+     * 修改时间
+     */
+    @TableField("updateTime")
+    private Date updateTime;
+    /**
+     * 修改人员
+     */
+    @TableField("updateUser")
+    private Integer updateUser;
+
+    public BaseBean() {
+        Date date = new Date();
+        this.flag = 1;
+        this.insertTime = date;
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getFlag() {
+        return flag;
+    }
+
+    public void setFlag(Integer flag) {
+        this.flag = flag;
+    }
+
+    public Date getInsertTime() {
+        return insertTime;
+    }
+
+    public void setInsertTime(Date insertTime) {
+        this.insertTime = insertTime;
+    }
+
+    public Integer getInsertUser() {
+        return insertUser;
+    }
+
+    public void setInsertUser(Integer insertUser) {
+        this.insertUser = insertUser;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public Integer getUpdateUser() {
+        return updateUser;
+    }
+
+    public void setUpdateUser(Integer updateUser) {
+        this.updateUser = updateUser;
+    }
+
+    @Override
+    public String toString() {
+        return "BaseBean{" +
+                "id=" + id +
+                ", flag=" + flag +
+                ", insertTime=" + insertTime +
+                ", insertUser=" + insertUser +
+                ", updateTime=" + updateTime +
+                ", updateUser=" + updateUser +
+                '}';
+    }
+}
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/SystemPriceCity.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/SystemPriceCity.java
new file mode 100644
index 0000000..a1abb22
--- /dev/null
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/SystemPriceCity.java
@@ -0,0 +1,44 @@
+package com.stylefeng.guns.modular.system.model;
+
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableName;
+import lombok.Data;
+
+/**
+ * @author zhibing.pu
+ * @Date 2025/7/26 9:16
+ */
+@Data
+@TableName("t_system_price_city")
+public class SystemPriceCity extends BaseBean {
+	/**
+	 * 省编号
+	 */
+	@TableField("areaCode")
+	private String areaCode;
+	/**
+	 * 省名称
+	 */
+	@TableField("areaName")
+	private String areaName;
+	/**
+	 * 市编号
+	 */
+	@TableField("cityCode")
+	private String cityCode;
+	/**
+	 * 市名称
+	 */
+	@TableField("cityName")
+	private String cityName;
+	/**
+	 * 区县编号
+	 */
+	@TableField("provinceCode")
+	private String provinceCode;
+	/**
+	 * 区县名称
+	 */
+	@TableField("provinceName")
+	private String provinceName;
+}
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TServerCarmodel.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TServerCarmodel.java
index 26663ee..1293dea 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TServerCarmodel.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TServerCarmodel.java
@@ -57,7 +57,10 @@
      * 添加时间
      */
     private Date insertTime;
-
+    
+    
+    @TableField(exist = false)
+    private String object;
     public String getPrice() {
         return price;
     }
@@ -113,7 +116,31 @@
     public void setInsertTime(Date insertTime) {
         this.insertTime = insertTime;
     }
-
+    
+    public Integer getPriceType() {
+        return priceType;
+    }
+    
+    public void setPriceType(Integer priceType) {
+        this.priceType = priceType;
+    }
+    
+    public String getIsCheck() {
+        return isCheck;
+    }
+    
+    public void setIsCheck(String isCheck) {
+        this.isCheck = isCheck;
+    }
+    
+    public String getObject() {
+        return object;
+    }
+    
+    public void setObject(String object) {
+        this.object = object;
+    }
+    
     @Override
     protected Serializable pkVal() {
         return this.id;
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSystemPrice.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSystemPrice.java
index 1ec7af7..a76621b 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSystemPrice.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSystemPrice.java
@@ -30,9 +30,10 @@
      */
     private Integer type;
     /**
-     * 企业id
+     * 价格城市id
      */
-    private Integer companyId;
+    @TableField("systemPriceCityId")
+    private Integer systemPriceCityId;
     /**
      * 服务车型id
      */
@@ -138,18 +139,6 @@
 
     public void setType(Integer type) {
         this.type = type;
-    }
-
-    public Integer getCompanyId() {
-        return companyId;
-    }
-
-    public void setCompanyId(Integer companyId) {
-        this.companyId = companyId;
-    }
-
-    public Integer getServerCarModelId() {
-        return serverCarModelId;
     }
 
     public void setServerCarModelId(Integer serverCarModelId) {
@@ -275,8 +264,19 @@
     public void setIsOpenPrice(Integer isOpenPrice) {
         this.isOpenPrice = isOpenPrice;
     }
-
-
+    
+    public Integer getSystemPriceCityId() {
+        return systemPriceCityId;
+    }
+    
+    public void setSystemPriceCityId(Integer systemPriceCityId) {
+        this.systemPriceCityId = systemPriceCityId;
+    }
+    
+    public Integer getServerCarModelId() {
+        return serverCarModelId;
+    }
+    
     @Override
     protected Serializable pkVal() {
         return this.id;
@@ -287,7 +287,6 @@
         return "TSystemPrice{" +
                 "id=" + id +
                 ", type=" + type +
-                ", companyId=" + companyId +
                 ", serverCarModelId=" + serverCarModelId +
                 ", content='" + content + '\'' +
                 ", fareTypeNote1='" + fareTypeNote1 + '\'' +
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ISystemPriceCityService.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ISystemPriceCityService.java
new file mode 100644
index 0000000..6d1b544
--- /dev/null
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ISystemPriceCityService.java
@@ -0,0 +1,25 @@
+package com.stylefeng.guns.modular.system.service;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.service.IService;
+import com.stylefeng.guns.modular.system.model.SystemPriceCity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author zhibing.pu
+ * @Date 2025/7/26 9:24
+ */
+public interface ISystemPriceCityService extends IService<SystemPriceCity> {
+	
+	/**
+	 * 获取价格列表
+	 * @param page
+	 * @param name
+	 * @param time
+	 * @return
+	 */
+	List<Map<String, Object>> queryList(Page<Map<String, Object>> page, String name, String time);
+	
+}
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/SystemPriceCityServiceImpl.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/SystemPriceCityServiceImpl.java
new file mode 100644
index 0000000..b5386b1
--- /dev/null
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/SystemPriceCityServiceImpl.java
@@ -0,0 +1,39 @@
+package com.stylefeng.guns.modular.system.service.impl;
+
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.stylefeng.guns.core.util.ToolUtil;
+import com.stylefeng.guns.modular.system.dao.SystemPriceCityMapper;
+import com.stylefeng.guns.modular.system.model.SystemPriceCity;
+import com.stylefeng.guns.modular.system.service.ISystemPriceCityService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author zhibing.pu
+ * @Date 2025/7/26 9:25
+ */
+@Service
+public class SystemPriceCityServiceImpl extends ServiceImpl<SystemPriceCityMapper, SystemPriceCity> implements ISystemPriceCityService {
+	
+	/**
+	 * 获取列表数据
+	 * @param page
+	 * @param name
+	 * @param time
+	 * @return
+	 */
+	@Override
+	public List<Map<String, Object>> queryList(Page<Map<String, Object>> page, String name, String time) {
+		String start = null;
+		String end = null;
+		if(ToolUtil.isNotEmpty(time)){
+			start = time.split("-")[0];
+			end = time.split("-")[0];
+		}
+		return this.baseMapper.queryList(page, name, start, end);
+	}
+}
\ No newline at end of file
diff --git a/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/systemPriceCity.html b/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/systemPriceCity.html
new file mode 100644
index 0000000..6a4a551
--- /dev/null
+++ b/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/systemPriceCity.html
@@ -0,0 +1,48 @@
+@layout("/common/_container.html"){
+<div class="row">
+	<div class="col-sm-12">
+		<div class="ibox float-e-margins">
+			<div class="ibox-title">
+				<h5>价格设置</h5>
+			</div>
+			<div class="ibox-content">
+				<div class="row row-lg">
+					<div class="col-sm-12">
+						<div class="row">
+							<div class="col-sm-3">
+								<#TimeCon id="insertTime" name="添加时间" isTime="false"/>
+							</div>
+							<div class="col-sm-3">
+								<#NameCon id="condition" name="省/市/区名称" />
+							</div>
+							<div class="col-sm-3">
+								<#button name="搜索" icon="fa-search" clickFun="TOpenCity.search()"/>
+								<#button name="重置" icon="fa-trash" clickFun="TOpenCity.resetSearch()" space="true"/>
+							</div>
+						</div>
+						<div class="hidden-xs" id="TOpenCityTableToolbar" role="group">
+							@if(shiro.hasPermission("/SystemPriceCity/add")){
+							<#button name="添加" icon="fa-plus" clickFun="TOpenCity.openAddTOpenCity()"/>
+							@}
+							@if(shiro.hasPermission("/SystemPriceCity/update")){
+							<#button name="编辑" icon="fa-edit" clickFun="TOpenCity.openTOpenCityDetail()" space="true"/>
+							@}
+							@if(shiro.hasPermission("/SystemPriceCity/delete")){
+							<#button name="删除" icon="fa-remove" clickFun="TOpenCity.delete()" space="true"/>
+							@}
+						</div>
+						<#table id="TOpenCityTable"/>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+<script src="${ctxPath}/static/modular/system/tSystemPrice/systemPriceCity.js"></script>
+<script>
+	laydate.render({
+		elem: '#insertTime'
+		,range: true
+	});
+</script>
+@}
diff --git a/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/systemPriceCity_add.html b/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/systemPriceCity_add.html
new file mode 100644
index 0000000..f6fe59f
--- /dev/null
+++ b/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/systemPriceCity_add.html
@@ -0,0 +1,65 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+	<div class="ibox-content">
+		<div class="form-horizontal" id="openCityForm">
+			<div class="row">
+				<div class="col-sm-10">
+					<#select id="areaCode" name="省：" onchange="TOpenCityInfoDlg.provinceChange()">
+						<option value="">选择省</option>
+						@for(province in provinceList){
+						<option value="${province.id}">${province.name}</option>
+						@}
+					</#select>
+					<#select id="cityCode" name="市：" onchange="TOpenCityInfoDlg.cityChange()">
+						<option value="">选择市</option>
+					</#select>
+					<#select id="provinceCode" name="区：">
+						<option value="">选择区</option>
+					</#select>
+					<div class="form-group">
+						<label class="col-sm-3 control-label">专车计价规则设置</label>
+						<div class="col-sm-9">
+							<div style="height: 200px; border: 1px solid #e5e6e7;overflow-y: auto;">
+								<table class="table table-striped table-bordered table-hover table-condensed">
+									<thead>
+									<tr>
+										<th style="width: 300px;">车型名称</th>
+										<th style="width: 300px;">价格设置</th>
+										<th style="width: 100px;">操作</th>
+									</tr>
+									</thead>
+									<tbody id="coun">
+										@for(obj in serverCarModelList){
+										<tr class="timeClass">
+											<td><input type="hidden" name="id" value='${obj.id}' /><input type="hidden" id="${obj.id}" name="price" value='' />${obj.name}</td>
+											<td><span id="zc_status_${obj.id}">未设置</span></td>
+											<td><a onclick="TOpenCityInfoDlg.openAddTZCPrice(${obj.id})" id="zc_set_${obj.id}" style="color:blue;">设置价格</a></td></td>
+										</tr>
+										@}
+									</tbody>
+								</table>
+							</div>
+						</div>
+					</div>
+					<div class="form-group">
+						<label class="col-sm-3 control-label">出租车价格设置</label>
+						<div class="col-sm-9" style="padding-top: 7px;">
+							<input type="hidden" id="zc_price" value=''>
+							<span id="czc_status">未设置价格</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+							<a href="#" id="czc_set" onclick="TOpenCityInfoDlg.openAddTextPrice()" style="color: blue;">价格设置</a>
+						</div>
+					</div>
+				</div>
+			</div>
+
+			<div class="row btn-group-m-t">
+				<div class="col-sm-10 col-sm-offset-5">
+					<#button btnCss="info" name="保存" id="ensure" icon="fa-check" clickFun="TOpenCityInfoDlg.addSubmit()"/>
+					<#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TOpenCityInfoDlg.close()"/>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+<script src="${ctxPath}/static/modular/system/tSystemPrice/systemPriceCity_info.js"></script>
+@}
diff --git a/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/systemPriceCity_edit.html b/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/systemPriceCity_edit.html
new file mode 100644
index 0000000..8273c09
--- /dev/null
+++ b/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/systemPriceCity_edit.html
@@ -0,0 +1,78 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+	<div class="ibox-content">
+		<div class="form-horizontal" id="openCityForm">
+			<div class="row">
+				<input type="hidden" id="id" name="id" value="${item.id}">
+				<div class="col-sm-10">
+					<#select id="areaCode" name="省：" onchange="TOpenCityInfoDlg.provinceChange()">
+						<option value="">选择省</option>
+						@if(null != provinceList){
+							@for(province in provinceList){
+							<option value="${province.id}" ${province.code == item.areaCode ? 'selected' : ''}>${province.name}</option>
+							@}
+						@}
+					</#select>
+					<#select id="cityCode" name="市：" onchange="TOpenCityInfoDlg.cityChange()">
+						<option value="">选择市</option>
+						@if(null != cityList){
+							@for(city in cityList){
+							<option value="${city.id}" ${city.code == item.cityCode ? 'selected' : ''}>${city.name}</option>
+							@}
+						@}
+					</#select>
+					<#select id="provinceCode" name="区：">
+						<option value="">选择区</option>
+						@if(null != areaList){
+							@for(area in areaList){
+							<option value="${area.id}" ${area.code == item.provinceCode ? 'selected' : ''}>${area.name}</option>
+							@}
+						@}
+					</#select>
+					<div class="form-group">
+						<label class="col-sm-3 control-label">专车计价规则设置</label>
+						<div class="col-sm-9">
+							<div style="height: 200px; border: 1px solid #e5e6e7;overflow-y: auto;">
+								<table class="table table-striped table-bordered table-hover table-condensed">
+									<thead>
+									<tr>
+										<th style="width: 300px;">车型名称</th>
+										<th style="width: 300px;">价格设置</th>
+										<th style="width: 100px;">操作</th>
+									</tr>
+									</thead>
+									<tbody id="coun">
+									@for(obj in serverCarModelList){
+									<tr class="timeClass">
+										<td><input type="hidden" name="id" value='${obj.id}' /><input type="hidden" id="${obj.id}" name="price" value='${obj.object}' />${obj.name}</td>
+										<td><span id="zc_status_${obj.id}">${null == obj.object ? '未设置' : '已设置'}</span></td>
+										<td><a onclick="TOpenCityInfoDlg.openAddTZCPrice(${obj.id})" id="zc_set_${obj.id}" style="color:blue;">${null == obj.object ? '设置价格' : '修改'}</a></td></td>
+									</tr>
+									@}
+									</tbody>
+								</table>
+							</div>
+						</div>
+					</div>
+					<div class="form-group">
+						<label class="col-sm-3 control-label">出租车价格设置</label>
+						<div class="col-sm-9" style="padding-top: 7px;">
+							<input type="hidden" id="zc_price" value='${zcPrice}'>
+							<span id="czc_status">${null == zcPrice ? '未设置价格' : '已设置'}</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+							<a href="#" id="czc_set" onclick="TOpenCityInfoDlg.openAddTextPrice()" style="color: blue;">${null == zcPrice ? '价格设置' : '修改'}</a>
+						</div>
+					</div>
+				</div>
+			</div>
+			
+			<div class="row btn-group-m-t">
+				<div class="col-sm-10 col-sm-offset-5">
+					<#button btnCss="info" name="保存" id="ensure" icon="fa-check" clickFun="TOpenCityInfoDlg.editSubmit()"/>
+					<#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TOpenCityInfoDlg.close()"/>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+<script src="${ctxPath}/static/modular/system/tSystemPrice/systemPriceCity_info.js"></script>
+@}
diff --git a/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/tSystemPrice_add.html b/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/tSystemPrice_add.html
index 3574e55..9a1859c 100644
--- a/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/tSystemPrice_add.html
+++ b/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/tSystemPrice_add.html
@@ -44,10 +44,7 @@
                         <label class="col-sm-2 control-label">选择车型：</label>
                         <div class="col-sm-10">
                             <select class="form-control" id="serverCarModelId" name="serverCarModelId"  style="width: 200px;">
-                                <option value="">选择车型</option>
-                                @for(obj in modelList!){
-                                <option value="${obj.id}">${obj.name}</option>
-                                @}
+                                <option value="${modelList.id}">${modelList.name}</option>
                             </select>
                         </div>
                     </div>
diff --git a/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/tSystemPrice_edit.html b/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/tSystemPrice_edit.html
index 6a7087d..7a4666d 100644
--- a/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/tSystemPrice_edit.html
+++ b/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/tSystemPrice_edit.html
@@ -37,25 +37,21 @@
 <div class="ibox float-e-margins">
     <div class="ibox-content">
         <div class="form-horizontal" id="specialPriceInfoForm">
-            <input type="hidden" id="id" value="${item.id}"/>
             <div class="row">
                 <div class="col-sm-11">
                     <div class="form-group">
                         <label class="col-sm-2 control-label">选择车型：</label>
                         <div class="col-sm-10">
                             <select class="form-control" id="serverCarModelId" name="serverCarModelId"  style="width: 200px;">
-                                <option value="">选择车型</option>
-                                @for(obj in modelList!){
-                                <option value="${obj.id}" ${item.serverCarModelId == obj.id ? 'selected' : ''}>${obj.name}</option>
-                                @}
+	                            <option value="${modelList.id}" selected}>${modelList.name}</option>
                             </select>
                         </div>
                     </div>
                     <div class="form-group waitFee">
                         <label class="col-sm-2 control-label">等待费设置：</label>
                         <div class="col-sm-10">
-                            司机到达预约地点&nbsp;<input type="text" onblur="checkIsMinute(this)" name="num1" id="num1" class="form-control newWidth" placeholder="最多3位数" value="${content.num1}"/>&nbsp;分钟过后开始收取等待费,
-                            为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num2" id="num2" class="form-control newWidth" placeholder="最多3位数" value="${content.num2}"/>&nbsp;元/分,不足一分钟按照一分钟计算
+                            司机到达预约地点&nbsp;<input type="text" onblur="checkIsMinute(this)" name="num1" id="num1" class="form-control newWidth" placeholder="最多3位数" value="${null != content ? content.num1 : ''}"/>&nbsp;分钟过后开始收取等待费,
+                            为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num2" id="num2" class="form-control newWidth" placeholder="最多3位数" value="${null == content ? '' : content.num2}"/>&nbsp;元/分,不足一分钟按照一分钟计算
                             <br/>
                         </div>
                     </div>
@@ -77,9 +73,9 @@
                                             <div class="form-group">
                                                 <label class="col-sm-2 control-label">起步价设置：</label>
                                                 <div class="col-sm-10">
-                                                    起步价为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num1" id="num1" class="form-control newWidth" value="${contentPutOne.num1}" placeholder="最多3位数"/>&nbsp;元,
-                                                    起步包含&nbsp;<input type="text" onblur="checkIsGongLi(this, 'p1')" name="num2" id="num2" class="form-control newWidth" value="${contentPutOne.num2}" placeholder="最多3位数"/>&nbsp;公里,
-                                                    &nbsp;<input type="text" onblur="checkIsMinute(this)" name="num3" id="num3" class="form-control newWidth" value="${contentPutOne.num3}" placeholder="最多3位数"/>&nbsp;分钟
+                                                    起步价为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num1" id="num1" class="form-control newWidth" value="${null == contentPutOne ? '' : contentPutOne.num1}" placeholder="最多3位数"/>&nbsp;元,
+                                                    起步包含&nbsp;<input type="text" onblur="checkIsGongLi(this, 'p1')" name="num2" id="num2" class="form-control newWidth" value="${null == contentPutOne ? '' : contentPutOne.num2}" placeholder="最多3位数"/>&nbsp;公里,
+                                                    &nbsp;<input type="text" onblur="checkIsMinute(this)" name="num3" id="num3" class="form-control newWidth" value="${null == contentPutOne ? '' : contentPutOne.num3}" placeholder="最多3位数"/>&nbsp;分钟
                                                     <br/>
                                                 </div>
                                             </div>
@@ -87,7 +83,7 @@
                                             <div class="form-group">
                                                 <label class="col-sm-2 control-label">里程费设置：</label>
                                                 <div class="col-sm-10">
-                                                    超过起步里程后每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num4" id="num4" value="${contentPutOne.num4}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
+                                                    超过起步里程后每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num4" id="num4" value="${null == contentPutOne ? '' : contentPutOne.num4}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                     <br/>
                                                 </div>
                                             </div>
@@ -95,7 +91,7 @@
                                             <div class="form-group">
                                                 <label class="col-sm-2 control-label">时长费设置：</label>
                                                 <div class="col-sm-10">
-                                                    超过起步时长后每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num5" id="num5" value="${contentPutOne.num5}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
+                                                    超过起步时长后每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num5" id="num5" value="${null != contentPutOne ? contentPutOne.num5 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                     <br/>
                                                 </div>
                                             </div>
@@ -103,18 +99,18 @@
                                             <div class="form-group">
                                                 <label class="col-sm-2 control-label">远途费设置：</label>
                                                 <div class="col-sm-10">
-                                                    总里程超过&nbsp;<input type="text" onblur="checkIsGongLi(this, 'p1')" name="num6" id="num6" value="${contentPutOne.num6}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里
-                                                    不足&nbsp;<input type="text" onblur="checkIsGongLi(this, 'p1')" name="num7" id="num7" value="${contentPutOne.num7}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里,
-                                                    超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this, 'p1')" name="num8" id="num8" value="${contentPutOne.num8}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
+                                                    总里程超过&nbsp;<input type="text" onblur="checkIsGongLi(this, 'p1')" name="num6" id="num6" value="${null != contentPutOne ? contentPutOne.num6 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里
+                                                    不足&nbsp;<input type="text" onblur="checkIsGongLi(this, 'p1')" name="num7" id="num7" value="${null != contentPutOne ? contentPutOne.num7 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里,
+                                                    超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this, 'p1')" name="num8" id="num8" value="${null != contentPutOne ? contentPutOne.num8 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                     <br>
                                                     <br>
-                                                    超过&nbsp;<input type="text" disabled onblur="checkIsGongLi(this, 'p1')" name="num9" id="num9" value="${contentPutOne.num9}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里
-                                                    不足&nbsp;<input type="text" onblur="checkIsGongLi(this, 'p1')" name="num10" id="num10" value="${contentPutOne.num10}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里时,
-                                                    超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this, 'p1')" name="num11" id="num11" value="${contentPutOne.num11}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
+                                                    超过&nbsp;<input type="text" disabled onblur="checkIsGongLi(this, 'p1')" name="num9" id="num9" value="${null != contentPutOne ? contentPutOne.num9 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里
+                                                    不足&nbsp;<input type="text" onblur="checkIsGongLi(this, 'p1')" name="num10" id="num10" value="${null != contentPutOne ? contentPutOne.num10 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里时,
+                                                    超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this, 'p1')" name="num11" id="num11" value="${null != contentPutOne ? contentPutOne.num11 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                     <br/>
                                                     <br>
-                                                    超过&nbsp;<input type="text" disabled onblur="checkIsGongLi(this, 'p1')" name="num12" id="num12" value="${contentPutOne.num12}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里以后,
-                                                    超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this, 'p1')" name="num13" id="num13" value="${contentPutOne.num13}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
+                                                    超过&nbsp;<input type="text" disabled onblur="checkIsGongLi(this, 'p1')" name="num12" id="num12" value="${null != contentPutOne ? contentPutOne.num12 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里以后,
+                                                    超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this, 'p1')" name="num13" id="num13" value="${null != contentPutOne ? contentPutOne.num13 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                     <br/>
                                                 </div>
                                             </div>
@@ -122,17 +118,17 @@
                                             <div class="form-group">
                                                 <label class="col-sm-2 control-label">夜间行驶费用设置：</label>
                                                 <div class="col-sm-10">
-                                                    <input type="text" name="num14" id="num14" value="${contentPutOne.num14}" class="form-control newWidth" placeholder="选择时间"/>&nbsp;点为夜间行驶时间,
-                                                    起步价变为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num15" id="num15" value="${contentPutOne.num15}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
+                                                    <input type="text" name="num14" id="num14" value="${null != contentPutOne ? contentPutOne.num14 : ''}" class="form-control newWidth" placeholder="选择时间"/>&nbsp;点为夜间行驶时间,
+                                                    起步价变为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num15" id="num15" value="${null != contentPutOne ? contentPutOne.num15 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                     <br>
                                                     <br>
-                                                    里程费为每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num16" id="num16" value="${contentPutOne.num16}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
-                                                    时长费为每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num17" id="num17" value="${contentPutOne.num17}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
+                                                    里程费为每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num16" id="num16" value="${null != contentPutOne ? contentPutOne.num16 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
+                                                    时长费为每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num17" id="num17" value="${null != contentPutOne ? contentPutOne.num17 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                     <br>
                                                     <br>
-                                                    远途费为每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num18" id="num18" value="${contentPutOne.num18}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
-                                                    、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num19" id="num19" value="${contentPutOne.num19}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
-                                                    、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num20" id="num20" value="${contentPutOne.num20}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
+                                                    远途费为每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num18" id="num18" value="${null != contentPutOne ? contentPutOne.num18 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
+                                                    、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num19" id="num19" value="${null != contentPutOne ? contentPutOne.num19 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
+                                                    、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num20" id="num20" value="${null != contentPutOne ? contentPutOne.num20 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                     <br/>
                                                 </div>
                                             </div>
@@ -140,18 +136,18 @@
                                             <div class="form-group">
                                                 <label class="col-sm-2 control-label">高峰期费用设置：</label>
                                                 <div class="col-sm-10">
-                                                    <input type="text" name="num21" id="num21" value="${contentPutOne.num21}" class="form-control newWidth" placeholder="选择时间段"/>&nbsp;
-                                                    和&nbsp;&nbsp;<input type="text" name="num22" id="num22" value="${contentPutOne.num22}" class="form-control newWidth" placeholder="选择时间段"/>&nbsp;为高峰期行车时间,
-                                                    起步价变为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num23" id="num23" value="${contentPutOne.num23}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
+                                                    <input type="text" name="num21" id="num21" value="${null != contentPutOne ? contentPutOne.num21 : ''}" class="form-control newWidth" placeholder="选择时间段"/>&nbsp;
+                                                    和&nbsp;&nbsp;<input type="text" name="num22" id="num22" value="${null != contentPutOne ? contentPutOne.num22 : ''}" class="form-control newWidth" placeholder="选择时间段"/>&nbsp;为高峰期行车时间,
+                                                    起步价变为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num23" id="num23" value="${null != contentPutOne ? contentPutOne.num23 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                     <br>
                                                     <br>
-                                                    里程费为每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num24" id="num24" value="${contentPutOne.num24}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
-                                                    时长费为每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num25" id="num25" value="${contentPutOne.num25}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
+                                                    里程费为每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num24" id="num24" value="${null != contentPutOne ? contentPutOne.num24 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
+                                                    时长费为每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num25" id="num25" value="${null != contentPutOne ? contentPutOne.num25 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                     <br>
                                                     <br>
-                                                    远途费为每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num26" id="num26" value="${contentPutOne.num26}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
-                                                    、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num27" id="num27" value="${contentPutOne.num27}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
-                                                    、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num28" id="num28" value="${contentPutOne.num28}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
+                                                    远途费为每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num26" id="num26" value="${null != contentPutOne ? contentPutOne.num26 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
+                                                    、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num27" id="num27" value="${null != contentPutOne ? contentPutOne.num27 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
+                                                    、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num28" id="num28" value="${null != contentPutOne ? contentPutOne.num28 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                     <br/>
                                                 </div>
                                             </div>
@@ -160,9 +156,9 @@
                                             <div class="form-group">
                                                 <label class="col-sm-2 control-label">起步价设置：</label>
                                                 <div class="col-sm-10">
-                                                    起步价为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num1" id="num1" value="${contentPutTwo.num1}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
-                                                    起步包含&nbsp;<input type="text" onblur="checkIsGongLi(this, 'p2')" name="num2" id="num2" value="${contentPutTwo.num2}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里,
-                                                    &nbsp;<input type="text" onblur="checkIsMinute(this)" name="num3" id="num3" value="${contentPutTwo.num3}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;分钟
+                                                    起步价为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num1" id="num1" value="${null != contentPutTwo ? contentPutTwo.num1 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
+                                                    起步包含&nbsp;<input type="text" onblur="checkIsGongLi(this, 'p2')" name="num2" id="num2" value="${null != contentPutTwo ? contentPutTwo.num2 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里,
+                                                    &nbsp;<input type="text" onblur="checkIsMinute(this)" name="num3" id="num3" value="${null != contentPutTwo ? contentPutTwo.num3 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;分钟
                                                     <br/>
                                                 </div>
                                             </div>
@@ -170,7 +166,7 @@
                                             <div class="form-group">
                                                 <label class="col-sm-2 control-label">里程费设置：</label>
                                                 <div class="col-sm-10">
-                                                    超过起步里程后每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num4" id="num4" value="${contentPutTwo.num4}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
+                                                    超过起步里程后每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num4" id="num4" value="${null != contentPutTwo ? contentPutTwo.num4 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                     <br/>
                                                 </div>
                                             </div>
@@ -178,7 +174,7 @@
                                             <div class="form-group">
                                                 <label class="col-sm-2 control-label">时长费设置：</label>
                                                 <div class="col-sm-10">
-                                                    超过起步时长后每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num5" id="num5" value="${contentPutTwo.num5}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
+                                                    超过起步时长后每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num5" id="num5" value="${null != contentPutTwo ? contentPutTwo.num5 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                     <br/>
                                                 </div>
                                             </div>
@@ -186,18 +182,18 @@
                                             <div class="form-group">
                                                 <label class="col-sm-2 control-label">远途费设置：</label>
                                                 <div class="col-sm-10">
-                                                    总里程超过&nbsp;<input type="text" onblur="checkIsGongLi(this, 'p2')" name="num6" id="num6" value="${contentPutTwo.num6}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里
-                                                    不足&nbsp;<input type="text" onblur="checkIsGongLi(this, 'p2')" name="num7" id="num7" value="${contentPutTwo.num7}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里,
-                                                    超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num8" id="num8" value="${contentPutTwo.num8}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
+                                                    总里程超过&nbsp;<input type="text" onblur="checkIsGongLi(this, 'p2')" name="num6" id="num6" value="${null != contentPutTwo ? contentPutTwo.num6 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里
+                                                    不足&nbsp;<input type="text" onblur="checkIsGongLi(this, 'p2')" name="num7" id="num7" value="${null != contentPutTwo ? contentPutTwo.num7 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里,
+                                                    超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num8" id="num8" value="${null != contentPutTwo ? contentPutTwo.num8 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                     <br>
                                                     <br>
-                                                    超过&nbsp;<input type="text" disabled onblur="checkIsGongLi(this, 'p2')" name="num9" id="num9" value="${contentPutTwo.num9}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里
-                                                    不足&nbsp;<input type="text" onblur="checkIsGongLi(this, 'p2')" name="num10" id="num10" value="${contentPutTwo.num10}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里时,
-                                                    超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num11" id="num11" value="${contentPutTwo.num11}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
+                                                    超过&nbsp;<input type="text" disabled onblur="checkIsGongLi(this, 'p2')" name="num9" id="num9" value="${null != contentPutTwo ? contentPutTwo.num9 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里
+                                                    不足&nbsp;<input type="text" onblur="checkIsGongLi(this, 'p2')" name="num10" id="num10" value="${null != contentPutTwo ? contentPutTwo.num10 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里时,
+                                                    超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num11" id="num11" value="${null != contentPutTwo ? contentPutTwo.num11 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                     <br/>
                                                     <br>
-                                                    超过&nbsp;<input type="text" disabled onblur="checkIsGongLi(this, 'p2')" name="num12" id="num12" value="${contentPutTwo.num12}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里以后,
-                                                    超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num13" id="num13" value="${contentPutTwo.num13}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
+                                                    超过&nbsp;<input type="text" disabled onblur="checkIsGongLi(this, 'p2')" name="num12" id="num12" value="${null != contentPutTwo ? contentPutTwo.num12 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里以后,
+                                                    超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num13" id="num13" value="${null != contentPutTwo ? contentPutTwo.num13 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                     <br/>
                                                 </div>
                                             </div>
@@ -205,17 +201,17 @@
                                             <div class="form-group">
                                                 <label class="col-sm-2 control-label">夜间行驶费用设置：</label>
                                                 <div class="col-sm-10">
-                                                    <input type="text" name="num14" id="num14" value="${contentPutTwo.num14}" class="form-control newWidth" placeholder="选择时间"/>&nbsp;点为夜间行驶时间,
-                                                    起步价变为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num15" id="num15" value="${contentPutTwo.num15}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
+                                                    <input type="text" name="num14" id="num14" value="${null != contentPutTwo ? contentPutTwo.num14 : ''}" class="form-control newWidth" placeholder="选择时间"/>&nbsp;点为夜间行驶时间,
+                                                    起步价变为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num15" id="num15" value="${null != contentPutTwo ? contentPutTwo.num15 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                     <br>
                                                     <br>
-                                                    里程费为每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num16" id="num16" value="${contentPutTwo.num16}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
-                                                    时长费为每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num17" id="num17" value="${contentPutTwo.num17}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
+                                                    里程费为每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num16" id="num16" value="${null != contentPutTwo ? contentPutTwo.num16 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
+                                                    时长费为每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num17" id="num17" value="${null != contentPutTwo ? contentPutTwo.num17 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                     <br>
                                                     <br>
-                                                    远途费为每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num18" id="num18" value="${contentPutTwo.num18}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
-                                                    、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num19" id="num19" value="${contentPutTwo.num19}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
-                                                    、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num20" id="num20" value="${contentPutTwo.num20}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
+                                                    远途费为每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num18" id="num18" value="${null != contentPutTwo ? contentPutTwo.num18 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
+                                                    、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num19" id="num19" value="${null != contentPutTwo ? contentPutTwo.num19 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
+                                                    、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num20" id="num20" value="${null != contentPutTwo ? contentPutTwo.num20 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                     <br/>
                                                 </div>
                                             </div>
@@ -223,18 +219,18 @@
                                             <div class="form-group">
                                                 <label class="col-sm-2 control-label">高峰期费用设置：</label>
                                                 <div class="col-sm-10">
-                                                    <input type="text" name="num21" id="num21" value="${contentPutTwo.num21}" class="form-control newWidth" placeholder="选择时间段"/>&nbsp;
-                                                    和&nbsp;&nbsp;<input type="text" name="num22" id="num22" value="${contentPutTwo.num22}" class="form-control newWidth" placeholder="选择时间段"/>&nbsp;为高峰期行车时间,
-                                                    起步价变为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num23" id="num23" value="${contentPutTwo.num23}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
+                                                    <input type="text" name="num21" id="num21" value="${null != contentPutTwo ? contentPutTwo.num21 : ''}" class="form-control newWidth" placeholder="选择时间段"/>&nbsp;
+                                                    和&nbsp;&nbsp;<input type="text" name="num22" id="num22" value="${null != contentPutTwo ? contentPutTwo.num22 : ''}" class="form-control newWidth" placeholder="选择时间段"/>&nbsp;为高峰期行车时间,
+                                                    起步价变为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num23" id="num23" value="${null != contentPutTwo ? contentPutTwo.num23 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                     <br>
                                                     <br>
-                                                    里程费为每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num24" id="num24" value="${contentPutTwo.num24}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
-                                                    时长费为每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num25" id="num25" value="${contentPutTwo.num25}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
+                                                    里程费为每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num24" id="num24" value="${null != contentPutTwo ? contentPutTwo.num24 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
+                                                    时长费为每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num25" id="num25" value="${null != contentPutTwo ? contentPutTwo.num25 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                     <br>
                                                     <br>
-                                                    远途费为每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num26" id="num26" value="${contentPutTwo.num26}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
-                                                    、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num27" id="num27" value="${contentPutTwo.num27}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
-                                                    、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num28" id="num28" value="${contentPutTwo.num28}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
+                                                    远途费为每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num26" id="num26" value="${null != contentPutTwo ? contentPutTwo.num26 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
+                                                    、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num27" id="num27" value="${null != contentPutTwo ? contentPutTwo.num27 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
+                                                    、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num28" id="num28" value="${null != contentPutTwo ? contentPutTwo.num28 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                     <br/>
                                                 </div>
                                             </div>
@@ -243,9 +239,9 @@
                                             <div class="form-group">
                                                 <label class="col-sm-2 control-label">起步价设置：</label>
                                                 <div class="col-sm-10">
-                                                    起步价为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num1" id="num1" value="${contentPutThree.num1}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
-                                                    起步包含&nbsp;<input type="text" onblur="checkIsGongLi(this, 'p3')" name="num2" id="num2" value="${contentPutThree.num2}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里,
-                                                    &nbsp;<input type="text" onblur="checkIsMinute(this)" name="num3" id="num3" value="${contentPutThree.num3}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;分钟
+                                                    起步价为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num1" id="num1" value="${null != contentPutThree ? contentPutThree.num1 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
+                                                    起步包含&nbsp;<input type="text" onblur="checkIsGongLi(this, 'p3')" name="num2" id="num2" value="${null != contentPutThree ? contentPutThree.num2 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里,
+                                                    &nbsp;<input type="text" onblur="checkIsMinute(this)" name="num3" id="num3" value="${null != contentPutThree ? contentPutThree.num3 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;分钟
                                                     <br/>
                                                 </div>
                                             </div>
@@ -253,7 +249,7 @@
                                             <div class="form-group">
                                                 <label class="col-sm-2 control-label">里程费设置：</label>
                                                 <div class="col-sm-10">
-                                                    超过起步里程后每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num4" id="num4" value="${contentPutThree.num4}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
+                                                    超过起步里程后每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num4" id="num4" value="${null != contentPutThree ? contentPutThree.num4 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                     <br/>
                                                 </div>
                                             </div>
@@ -261,7 +257,7 @@
                                             <div class="form-group">
                                                 <label class="col-sm-2 control-label">时长费设置：</label>
                                                 <div class="col-sm-10">
-                                                    超过起步时长后每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num5" id="num5" value="${contentPutThree.num5}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
+                                                    超过起步时长后每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num5" id="num5" value="${null != contentPutThree ? contentPutThree.num5 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                     <br/>
                                                 </div>
                                             </div>
@@ -269,18 +265,18 @@
                                             <div class="form-group">
                                                 <label class="col-sm-2 control-label">远途费设置：</label>
                                                 <div class="col-sm-10">
-                                                    总里程超过&nbsp;<input type="text" onblur="checkIsGongLi(this, 'p3')" name="num6" id="num6" value="${contentPutThree.num6}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里
-                                                    不足&nbsp;<input type="text" onblur="checkIsGongLi(this, 'p3')" name="num7" id="num7" value="${contentPutThree.num7}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里,
-                                                    超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num8" id="num8" value="${contentPutThree.num8}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
+                                                    总里程超过&nbsp;<input type="text" onblur="checkIsGongLi(this, 'p3')" name="num6" id="num6" value="${null != contentPutThree ? contentPutThree.num6 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里
+                                                    不足&nbsp;<input type="text" onblur="checkIsGongLi(this, 'p3')" name="num7" id="num7" value="${null != contentPutThree ? contentPutThree.num7 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里,
+                                                    超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num8" id="num8" value="${null != contentPutThree ? contentPutThree.num8 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                     <br>
                                                     <br>
-                                                    超过&nbsp;<input type="text" disabled onblur="checkIsGongLi(this, 'p3')" name="num9" id="num9" value="${contentPutThree.num9}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里
-                                                    不足&nbsp;<input type="text" onblur="checkIsGongLi(this, 'p3')" name="num10" id="num10" value="${contentPutThree.num10}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里时,
-                                                    超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num11" id="num11" value="${contentPutThree.num11}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
+                                                    超过&nbsp;<input type="text" disabled onblur="checkIsGongLi(this, 'p3')" name="num9" id="num9" value="${null != contentPutThree ? contentPutThree.num9 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里
+                                                    不足&nbsp;<input type="text" onblur="checkIsGongLi(this, 'p3')" name="num10" id="num10" value="${null != contentPutThree ? contentPutThree.num10 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里时,
+                                                    超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num11" id="num11" value="${null != contentPutThree ? contentPutThree.num11 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                     <br/>
                                                     <br>
-                                                    超过&nbsp;<input type="text" disabled onblur="checkIsGongLi(this, 'p3')" name="num12" id="num12" value="${contentPutThree.num12}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里以后,
-                                                    超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num13" id="num13" value="${contentPutThree.num13}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
+                                                    超过&nbsp;<input type="text" disabled onblur="checkIsGongLi(this, 'p3')" name="num12" id="num12" value="${null != contentPutThree ? contentPutThree.num12 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里以后,
+                                                    超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num13" id="num13" value="${null != contentPutThree ? contentPutThree.num13 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                     <br/>
                                                 </div>
                                             </div>
@@ -288,17 +284,17 @@
                                             <div class="form-group">
                                                 <label class="col-sm-2 control-label">夜间行驶费用设置：</label>
                                                 <div class="col-sm-10">
-                                                    <input type="text" name="num14" id="num14" value="${contentPutThree.num14}" class="form-control newWidth" placeholder="选择时间"/>&nbsp;点为夜间行驶时间,
-                                                    起步价变为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num15" id="num15" value="${contentPutThree.num15}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
+                                                    <input type="text" name="num14" id="num14" value="${null != contentPutThree ? contentPutThree.num14 : ''}" class="form-control newWidth" placeholder="选择时间"/>&nbsp;点为夜间行驶时间,
+                                                    起步价变为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num15" id="num15" value="${null != contentPutThree ? contentPutThree.num15 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                     <br>
                                                     <br>
-                                                    里程费为每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num16" id="num16" value="${contentPutThree.num16}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
-                                                    时长费为每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num17" id="num17" value="${contentPutThree.num17}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
+                                                    里程费为每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num16" id="num16" value="${null != contentPutThree ? contentPutThree.num16 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
+                                                    时长费为每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num17" id="num17" value="${null != contentPutThree ? contentPutThree.num17 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                     <br>
                                                     <br>
-                                                    远途费为每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num18" id="num18" value="${contentPutThree.num18}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
-                                                    、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num19" id="num19" value="${contentPutThree.num19}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
-                                                    、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num20" id="num20" value="${contentPutThree.num20}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
+                                                    远途费为每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num18" id="num18" value="${null != contentPutThree ? contentPutThree.num18 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
+                                                    、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num19" id="num19" value="${null != contentPutThree ? contentPutThree.num19 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
+                                                    、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num20" id="num20" value="${null != contentPutThree ? contentPutThree.num20 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                     <br/>
                                                 </div>
                                             </div>
@@ -306,18 +302,18 @@
                                             <div class="form-group">
                                                 <label class="col-sm-2 control-label">高峰期费用设置：</label>
                                                 <div class="col-sm-10">
-                                                    <input type="text" name="num21" id="num21" value="${contentPutThree.num21}" class="form-control newWidth" placeholder="选择时间段"/>&nbsp;
-                                                    和&nbsp;&nbsp;<input type="text" name="num22" id="num22" value="${contentPutThree.num22}" class="form-control newWidth" placeholder="选择时间段"/>&nbsp;为高峰期行车时间,
-                                                    起步价变为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num23" id="num23" value="${contentPutThree.num23}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
+                                                    <input type="text" name="num21" id="num21" value="${null != contentPutThree ? contentPutThree.num21 : ''}" class="form-control newWidth" placeholder="选择时间段"/>&nbsp;
+                                                    和&nbsp;&nbsp;<input type="text" name="num22" id="num22" value="${null != contentPutThree ? contentPutThree.num22 : ''}" class="form-control newWidth" placeholder="选择时间段"/>&nbsp;为高峰期行车时间,
+                                                    起步价变为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num23" id="num23" value="${null != contentPutThree ? contentPutThree.num23 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                     <br>
                                                     <br>
-                                                    里程费为每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num24" id="num24" value="${contentPutThree.num24}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
-                                                    时长费为每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num25" id="num25" value="${contentPutThree.num25}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
+                                                    里程费为每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num24" id="num24" value="${null != contentPutThree ? contentPutThree.num24 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
+                                                    时长费为每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num25" id="num25" value="${null != contentPutThree ? contentPutThree.num25 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                     <br>
                                                     <br>
-                                                    远途费为每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num26" id="num26" value="${contentPutThree.num26}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
-                                                    、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num27" id="num27" value="${contentPutThree.num27}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
-                                                    、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num28" id="num28" value="${contentPutThree.num28}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
+                                                    远途费为每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num26" id="num26" value="${null != contentPutThree ? contentPutThree.num26 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
+                                                    、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num27" id="num27" value="${null != contentPutThree ? contentPutThree.num27 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
+                                                    、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num28" id="num28" value="${null != contentPutThree ? contentPutThree.num28 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                     <br/>
                                                 </div>
                                             </div>
@@ -326,9 +322,9 @@
                                             <div class="form-group">
                                                 <label class="col-sm-2 control-label">起步价设置：</label>
                                                 <div class="col-sm-10">
-                                                    起步价为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num1" id="num1" value="${contentNotOne.num1}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
-                                                    起步包含&nbsp;<input type="text" onblur="checkIsGongLi(this, 'wp1')" name="num2" id="num2" value="${contentNotOne.num2}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里,
-                                                    &nbsp;<input type="text" onblur="checkIsMinute(this)" name="num3" id="num3" value="${contentNotOne.num3}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;分钟
+                                                    起步价为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num1" id="num1" value="${null != contentNotOne ? contentNotOne.num1 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
+                                                    起步包含&nbsp;<input type="text" onblur="checkIsGongLi(this, 'wp1')" name="num2" id="num2" value="${null != contentNotOne ? contentNotOne.num2 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里,
+                                                    &nbsp;<input type="text" onblur="checkIsMinute(this)" name="num3" id="num3" value="${null != contentNotOne ? contentNotOne.num3 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;分钟
                                                     <br/>
                                                 </div>
                                             </div>
@@ -336,7 +332,7 @@
                                             <div class="form-group">
                                                 <label class="col-sm-2 control-label">里程费设置：</label>
                                                 <div class="col-sm-10">
-                                                    超过起步里程后每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num4" id="num4" value="${contentNotOne.num4}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
+                                                    超过起步里程后每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num4" id="num4" value="${null != contentNotOne ? contentNotOne.num4 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                     <br/>
                                                 </div>
                                             </div>
@@ -344,7 +340,7 @@
                                             <div class="form-group">
                                                 <label class="col-sm-2 control-label">时长费设置：</label>
                                                 <div class="col-sm-10">
-                                                    超过起步时长后每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num5" id="num5" value="${contentNotOne.num5}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
+                                                    超过起步时长后每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num5" id="num5" value="${null != contentNotOne ? contentNotOne.num5 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                     <br/>
                                                 </div>
                                             </div>
@@ -352,18 +348,18 @@
                                             <div class="form-group">
                                                 <label class="col-sm-2 control-label">远途费设置：</label>
                                                 <div class="col-sm-10">
-                                                    总里程超过&nbsp;<input type="text" onblur="checkIsGongLi(this, 'wp1')" name="num6" id="num6" value="${contentNotOne.num6}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里
-                                                    不足&nbsp;<input type="text" onblur="checkIsGongLi(this, 'wp1')" name="num7" id="num7" value="${contentNotOne.num7}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里,
-                                                    超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num8" id="num8" value="${contentNotOne.num8}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
+                                                    总里程超过&nbsp;<input type="text" onblur="checkIsGongLi(this, 'wp1')" name="num6" id="num6" value="${null != contentNotOne ? contentNotOne.num6 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里
+                                                    不足&nbsp;<input type="text" onblur="checkIsGongLi(this, 'wp1')" name="num7" id="num7" value="${null != contentNotOne ? contentNotOne.num7 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里,
+                                                    超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num8" id="num8" value="${null != contentNotOne ? contentNotOne.num8 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                     <br>
                                                     <br>
-                                                    超过&nbsp;<input type="text" disabled onblur="checkIsGongLi(this, 'wp1')" name="num9" id="num9" value="${contentNotOne.num9}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里
-                                                    不足&nbsp;<input type="text" onblur="checkIsGongLi(this, 'wp1')" name="num10" id="num10" value="${contentNotOne.num10}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里时,
-                                                    超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num11" id="num11" value="${contentNotOne.num11}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
+                                                    超过&nbsp;<input type="text" disabled onblur="checkIsGongLi(this, 'wp1')" name="num9" id="num9" value="${null != contentNotOne ? contentNotOne.num9 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里
+                                                    不足&nbsp;<input type="text" onblur="checkIsGongLi(this, 'wp1')" name="num10" id="num10" value="${null != contentNotOne ? contentNotOne.num10 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里时,
+                                                    超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num11" id="num11" value="${null != contentNotOne ? contentNotOne.num11 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                     <br/>
                                                     <br>
-                                                    超过&nbsp;<input type="text" disabled onblur="checkIsGongLi(this, 'wp1')" name="num12" id="num12" value="${contentNotOne.num12}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里以后,
-                                                    超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num13" id="num13" value="${contentNotOne.num13}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
+                                                    超过&nbsp;<input type="text" disabled onblur="checkIsGongLi(this, 'wp1')" name="num12" id="num12" value="${null != contentNotOne ? contentNotOne.num12 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里以后,
+                                                    超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num13" id="num13" value="${null != contentNotOne ? contentNotOne.num13 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                     <br/>
                                                 </div>
                                             </div>
@@ -371,17 +367,17 @@
                                             <div class="form-group">
                                                 <label class="col-sm-2 control-label">夜间行驶费用设置：</label>
                                                 <div class="col-sm-10">
-                                                    <input type="text" name="num14" id="num14" value="${contentNotOne.num14}" class="form-control newWidth" placeholder="选择时间"/>&nbsp;点为夜间行驶时间,
-                                                    起步价变为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num15" id="num15" value="${contentNotOne.num15}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
+                                                    <input type="text" name="num14" id="num14" value="${null != contentNotOne ? contentNotOne.num14 : ''}" class="form-control newWidth" placeholder="选择时间"/>&nbsp;点为夜间行驶时间,
+                                                    起步价变为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num15" id="num15" value="${null != contentNotOne ? contentNotOne.num15 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                     <br>
                                                     <br>
-                                                    里程费为每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num16" id="num16" value="${contentNotOne.num16}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
-                                                    时长费为每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num17" id="num17" value="${contentNotOne.num17}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
+                                                    里程费为每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num16" id="num16" value="${null != contentNotOne ? contentNotOne.num16 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
+                                                    时长费为每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num17" id="num17" value="${null != contentNotOne ? contentNotOne.num17 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                     <br>
                                                     <br>
-                                                    远途费为每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num18" id="num18" value="${contentNotOne.num18}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
-                                                    、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num19" id="num19" value="${contentNotOne.num19}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
-                                                    、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num20" id="num20" value="${contentNotOne.num20}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
+                                                    远途费为每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num18" id="num18" value="${null != contentNotOne ? contentNotOne.num18 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
+                                                    、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num19" id="num19" value="${null != contentNotOne ? contentNotOne.num19 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
+                                                    、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num20" id="num20" value="${null != contentNotOne ? contentNotOne.num20 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                     <br/>
                                                 </div>
                                             </div>
@@ -389,18 +385,18 @@
                                             <div class="form-group">
                                                 <label class="col-sm-2 control-label">高峰期费用设置：</label>
                                                 <div class="col-sm-10">
-                                                    <input type="text" name="num21" id="num21" value="${contentNotOne.num21}" class="form-control newWidth" placeholder="选择时间段"/>&nbsp;
-                                                    和&nbsp;&nbsp;<input type="text" name="num22" id="num22" value="${contentNotOne.num22}" class="form-control newWidth" placeholder="选择时间段"/>&nbsp;为高峰期行车时间,
-                                                    起步价变为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num23" id="num23" value="${contentNotOne.num23}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
+                                                    <input type="text" name="num21" id="num21" value="${null != contentNotOne ? contentNotOne.num21 : ''}" class="form-control newWidth" placeholder="选择时间段"/>&nbsp;
+                                                    和&nbsp;&nbsp;<input type="text" name="num22" id="num22" value="${null != contentNotOne ? contentNotOne.num22 : ''}" class="form-control newWidth" placeholder="选择时间段"/>&nbsp;为高峰期行车时间,
+                                                    起步价变为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num23" id="num23" value="${null != contentNotOne ? contentNotOne.num23 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                     <br>
                                                     <br>
-                                                    里程费为每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num24" id="num24" value="${contentNotOne.num24}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
-                                                    时长费为每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num25" id="num25" value="${contentNotOne.num25}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
+                                                    里程费为每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num24" id="num24" value="${null != contentNotOne ? contentNotOne.num24 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
+                                                    时长费为每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num25" id="num25" value="${null != contentNotOne ? contentNotOne.num25 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                     <br>
                                                     <br>
-                                                    远途费为每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num26" id="num26" value="${contentNotOne.num26}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
-                                                    、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num27" id="num27" value="${contentNotOne.num27}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
-                                                    、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num28" id="num28" value="${contentNotOne.num28}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
+                                                    远途费为每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num26" id="num26" value="${null != contentNotOne ? contentNotOne.num26 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
+                                                    、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num27" id="num27" value="${null != contentNotOne ? contentNotOne.num27 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
+                                                    、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num28" id="num28" value="${null != contentNotOne ? contentNotOne.num28 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                     <br/>
                                                 </div>
                                             </div>
@@ -409,9 +405,9 @@
                                             <div class="form-group">
                                                 <label class="col-sm-2 control-label">起步价设置：</label>
                                                 <div class="col-sm-10">
-                                                    起步价为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num1" id="num1" value="${contentNotTwo.num1}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
-                                                    起步包含&nbsp;<input type="text" onblur="checkIsGongLi(this, 'wp2')" name="num2" id="num2" value="${contentNotTwo.num2}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里,
-                                                    &nbsp;<input type="text" onblur="checkIsMinute(this)" name="num3" id="num3" value="${contentNotTwo.num3}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;分钟
+                                                    起步价为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num1" id="num1" value="${null != contentNotTwo ? contentNotTwo.num1 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
+                                                    起步包含&nbsp;<input type="text" onblur="checkIsGongLi(this, 'wp2')" name="num2" id="num2" value="${null != contentNotTwo ? contentNotTwo.num2 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里,
+                                                    &nbsp;<input type="text" onblur="checkIsMinute(this)" name="num3" id="num3" value="${null != contentNotTwo ? contentNotTwo.num3 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;分钟
                                                     <br/>
                                                 </div>
                                             </div>
@@ -419,7 +415,7 @@
                                             <div class="form-group">
                                                 <label class="col-sm-2 control-label">里程费设置：</label>
                                                 <div class="col-sm-10">
-                                                    超过起步里程后每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num4" id="num4" value="${contentNotTwo.num4}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
+                                                    超过起步里程后每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num4" id="num4" value="${null != contentNotTwo ? contentNotTwo.num4 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                     <br/>
                                                 </div>
                                             </div>
@@ -427,7 +423,7 @@
                                             <div class="form-group">
                                                 <label class="col-sm-2 control-label">时长费设置：</label>
                                                 <div class="col-sm-10">
-                                                    超过起步时长后每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num5" id="num5" value="${contentNotTwo.num5}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
+                                                    超过起步时长后每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num5" id="num5" value="${null != contentNotTwo ? contentNotTwo.num5 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                     <br/>
                                                 </div>
                                             </div>
@@ -435,18 +431,18 @@
                                             <div class="form-group">
                                                 <label class="col-sm-2 control-label">远途费设置：</label>
                                                 <div class="col-sm-10">
-                                                    总里程超过&nbsp;<input type="text" onblur="checkIsGongLi(this, 'wp2')" name="num6" id="num6" value="${contentNotTwo.num6}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里
-                                                    不足&nbsp;<input type="text" onblur="checkIsGongLi(this, 'wp2')" name="num7" id="num7" value="${contentNotTwo.num7}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里,
-                                                    超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num8" id="num8" value="${contentNotTwo.num8}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
+                                                    总里程超过&nbsp;<input type="text" onblur="checkIsGongLi(this, 'wp2')" name="num6" id="num6" value="${null != contentNotTwo ? contentNotTwo.num6 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里
+                                                    不足&nbsp;<input type="text" onblur="checkIsGongLi(this, 'wp2')" name="num7" id="num7" value="${null != contentNotTwo ? contentNotTwo.num7 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里,
+                                                    超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num8" id="num8" value="${null != contentNotTwo ? contentNotTwo.num8 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                     <br>
                                                     <br>
-                                                    超过&nbsp;<input type="text" disabled onblur="checkIsGongLi(this, 'wp2')" name="num9" id="num9" value="${contentNotTwo.num9}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里
-                                                    不足&nbsp;<input type="text" onblur="checkIsGongLi(this, 'wp2')" name="num10" id="num10" value="${contentNotTwo.num10}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里时,
-                                                    超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num11" id="num11" value="${contentNotTwo.num11}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
+                                                    超过&nbsp;<input type="text" disabled onblur="checkIsGongLi(this, 'wp2')" name="num9" id="num9" value="${null != contentNotTwo ? contentNotTwo.num9 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里
+                                                    不足&nbsp;<input type="text" onblur="checkIsGongLi(this, 'wp2')" name="num10" id="num10" value="${null != contentNotTwo ? contentNotTwo.num10 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里时,
+                                                    超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num11" id="num11" value="${null != contentNotTwo ? contentNotTwo.num11 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                     <br/>
                                                     <br>
-                                                    超过&nbsp;<input type="text" disabled onblur="checkIsGongLi(this, 'wp2')" name="num12" id="num12" value="${contentNotTwo.num12}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里以后,
-                                                    超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num13" id="num13" value="${contentNotTwo.num13}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
+                                                    超过&nbsp;<input type="text" disabled onblur="checkIsGongLi(this, 'wp2')" name="num12" id="num12" value="${null != contentNotTwo ? contentNotTwo.num12 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里以后,
+                                                    超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num13" id="num13" value="${null != contentNotTwo ? contentNotTwo.num13 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                     <br/>
                                                 </div>
                                             </div>
@@ -454,17 +450,17 @@
                                             <div class="form-group">
                                                 <label class="col-sm-2 control-label">夜间行驶费用设置：</label>
                                                 <div class="col-sm-10">
-                                                    <input type="text" name="num14" id="num14" value="${contentNotTwo.num14}" class="form-control newWidth" placeholder="选择时间"/>&nbsp;点为夜间行驶时间,
-                                                    起步价变为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num15" id="num15" value="${contentNotTwo.num15}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
+                                                    <input type="text" name="num14" id="num14" value="${null != contentNotTwo ? contentNotTwo.num14 : ''}" class="form-control newWidth" placeholder="选择时间"/>&nbsp;点为夜间行驶时间,
+                                                    起步价变为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num15" id="num15" value="${null != contentNotTwo ? contentNotTwo.num15 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                     <br>
                                                     <br>
-                                                    里程费为每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num16" id="num16" value="${contentNotTwo.num16}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
-                                                    时长费为每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num17" id="num17" value="${contentNotTwo.num17}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
+                                                    里程费为每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num16" id="num16" value="${null != contentNotTwo ? contentNotTwo.num16 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
+                                                    时长费为每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num17" id="num17" value="${null != contentNotTwo ? contentNotTwo.num17 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                     <br>
                                                     <br>
-                                                    远途费为每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num18" id="num18" value="${contentNotTwo.num18}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
-                                                    、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num19" id="num19" value="${contentNotTwo.num19}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
-                                                    、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num20" id="num20" value="${contentNotTwo.num20}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
+                                                    远途费为每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num18" id="num18" value="${null != contentNotTwo ? contentNotTwo.num18 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
+                                                    、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num19" id="num19" value="${null != contentNotTwo ? contentNotTwo.num19 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
+                                                    、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num20" id="num20" value="${null != contentNotTwo ? contentNotTwo.num20 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                     <br/>
                                                 </div>
                                             </div>
@@ -472,18 +468,18 @@
                                             <div class="form-group">
                                                 <label class="col-sm-2 control-label">高峰期费用设置：</label>
                                                 <div class="col-sm-10">
-                                                    <input type="text" name="num21" id="num21" value="${contentNotTwo.num21}" class="form-control newWidth" placeholder="选择时间段"/>&nbsp;
-                                                    和&nbsp;&nbsp;<input type="text" name="num22" id="num22" value="${contentNotTwo.num22}" class="form-control newWidth" placeholder="选择时间段"/>&nbsp;为高峰期行车时间,
-                                                    起步价变为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num23" id="num23" value="${contentNotTwo.num23}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
+                                                    <input type="text" name="num21" id="num21" value="${null != contentNotTwo ? contentNotTwo.num21 : ''}" class="form-control newWidth" placeholder="选择时间段"/>&nbsp;
+                                                    和&nbsp;&nbsp;<input type="text" name="num22" id="num22" value="${null != contentNotTwo ? contentNotTwo.num22 : ''}" class="form-control newWidth" placeholder="选择时间段"/>&nbsp;为高峰期行车时间,
+                                                    起步价变为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num23" id="num23" value="${null != contentNotTwo ? contentNotTwo.num23 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                     <br>
                                                     <br>
-                                                    里程费为每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num24" id="num24" value="${contentNotTwo.num24}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
-                                                    时长费为每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num25" id="num25" value="${contentNotTwo.num25}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
+                                                    里程费为每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num24" id="num24" value="${null != contentNotTwo ? contentNotTwo.num24 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
+                                                    时长费为每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num25" id="num25" value="${null != contentNotTwo ? contentNotTwo.num25 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                     <br>
                                                     <br>
-                                                    远途费为每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num26" id="num26" value="${contentNotTwo.num26}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
-                                                    、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num27" id="num27" value="${contentNotTwo.num27}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
-                                                    、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num28" id="num28" value="${contentNotTwo.num28}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
+                                                    远途费为每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num26" id="num26" value="${null != contentNotTwo ? contentNotTwo.num26 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
+                                                    、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num27" id="num27" value="${null != contentNotTwo ? contentNotTwo.num27 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
+                                                    、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num28" id="num28" value="${null != contentNotTwo ? contentNotTwo.num28 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                     <br/>
                                                 </div>
                                             </div>
@@ -492,9 +488,9 @@
                                             <div class="form-group">
                                                 <label class="col-sm-2 control-label">起步价设置：</label>
                                                 <div class="col-sm-10">
-                                                    起步价为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num1" id="num1" value="${contentNotThree.num1}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
-                                                    起步包含&nbsp;<input type="text" onblur="checkIsGongLi(this, 'wp3')" name="num2" id="num2" value="${contentNotThree.num2}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里,
-                                                    &nbsp;<input type="text" onblur="checkIsMinute(this)" name="num3" id="num3" value="${contentNotThree.num3}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;分钟
+                                                    起步价为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num1" id="num1" value="${null != contentNotThree ? contentNotThree.num1 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
+                                                    起步包含&nbsp;<input type="text" onblur="checkIsGongLi(this, 'wp3')" name="num2" id="num2" value="${null != contentNotThree ? contentNotThree.num2 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里,
+                                                    &nbsp;<input type="text" onblur="checkIsMinute(this)" name="num3" id="num3" value="${null != contentNotThree ? contentNotThree.num3 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;分钟
                                                     <br/>
                                                 </div>
                                             </div>
@@ -502,7 +498,7 @@
                                             <div class="form-group">
                                                 <label class="col-sm-2 control-label">里程费设置：</label>
                                                 <div class="col-sm-10">
-                                                    超过起步里程后每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num4" id="num4" value="${contentNotThree.num4}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
+                                                    超过起步里程后每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num4" id="num4" value="${null != contentNotThree ? contentNotThree.num4 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                     <br/>
                                                 </div>
                                             </div>
@@ -510,7 +506,7 @@
                                             <div class="form-group">
                                                 <label class="col-sm-2 control-label">时长费设置：</label>
                                                 <div class="col-sm-10">
-                                                    超过起步时长后每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num5" id="num5" value="${contentNotThree.num5}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
+                                                    超过起步时长后每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num5" id="num5" value="${null != contentNotThree ? contentNotThree.num5 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                     <br/>
                                                 </div>
                                             </div>
@@ -518,18 +514,18 @@
                                             <div class="form-group">
                                                 <label class="col-sm-2 control-label">远途费设置：</label>
                                                 <div class="col-sm-10">
-                                                    总里程超过&nbsp;<input type="text" onblur="checkIsGongLi(this, 'wp3')" name="num6" id="num6" value="${contentNotThree.num6}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里
-                                                    不足&nbsp;<input type="text" onblur="checkIsGongLi(this, 'wp3')" name="num7" id="num7" value="${contentNotThree.num7}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里,
-                                                    超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num8" id="num8" value="${contentNotThree.num8}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
+                                                    总里程超过&nbsp;<input type="text" onblur="checkIsGongLi(this, 'wp3')" name="num6" id="num6" value="${null != contentNotThree ? contentNotThree.num6 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里
+                                                    不足&nbsp;<input type="text" onblur="checkIsGongLi(this, 'wp3')" name="num7" id="num7" value="${null != contentNotThree ? contentNotThree.num7 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里,
+                                                    超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num8" id="num8" value="${null != contentNotThree ? contentNotThree.num8 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                     <br>
                                                     <br>
-                                                    超过&nbsp;<input type="text" disabled onblur="checkIsGongLi(this, 'wp3')" name="num9" id="num9" value="${contentNotThree.num9}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里
-                                                    不足&nbsp;<input type="text" onblur="checkIsGongLi(this, 'wp3')" name="num10" id="num10" value="${contentNotThree.num10}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里时,
-                                                    超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num11" id="num11" value="${contentNotThree.num11}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
+                                                    超过&nbsp;<input type="text" disabled onblur="checkIsGongLi(this, 'wp3')" name="num9" id="num9" value="${null != contentNotThree ? contentNotThree.num9 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里
+                                                    不足&nbsp;<input type="text" onblur="checkIsGongLi(this, 'wp3')" name="num10" id="num10" value="${null != contentNotThree ? contentNotThree.num10 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里时,
+                                                    超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num11" id="num11" value="${null != contentNotThree ? contentNotThree.num11 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                     <br/>
                                                     <br>
-                                                    超过&nbsp;<input type="text" disabled onblur="checkIsGongLi(this, 'wp3')" name="num12" id="num12" value="${contentNotThree.num12}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里以后,
-                                                    超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num13" id="num13" value="${contentNotThree.num13}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
+                                                    超过&nbsp;<input type="text" disabled onblur="checkIsGongLi(this, 'wp3')" name="num12" id="num12" value="${null != contentNotThree ? contentNotThree.num12 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里以后,
+                                                    超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num13" id="num13" value="${null != contentNotThree ? contentNotThree.num13 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                     <br/>
                                                 </div>
                                             </div>
@@ -537,17 +533,17 @@
                                             <div class="form-group">
                                                 <label class="col-sm-2 control-label">夜间行驶费用设置：</label>
                                                 <div class="col-sm-10">
-                                                    <input type="text" name="num14" id="num14" value="${contentNotThree.num14}" class="form-control newWidth" placeholder="选择时间"/>&nbsp;点为夜间行驶时间,
-                                                    起步价变为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num15" id="num15" value="${contentNotThree.num15}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
+                                                    <input type="text" name="num14" id="num14" value="${null != contentNotThree ? contentNotThree.num14 : ''}" class="form-control newWidth" placeholder="选择时间"/>&nbsp;点为夜间行驶时间,
+                                                    起步价变为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num15" id="num15" value="${null != contentNotThree ? contentNotThree.num15 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                     <br>
                                                     <br>
-                                                    里程费为每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num16" id="num16" value="${contentNotThree.num16}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
-                                                    时长费为每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num17" id="num17" value="${contentNotThree.num17}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
+                                                    里程费为每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num16" id="num16" value="${null != contentNotThree ? contentNotThree.num16 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
+                                                    时长费为每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num17" id="num17" value="${null != contentNotThree ? contentNotThree.num17 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                     <br>
                                                     <br>
-                                                    远途费为每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num18" id="num18" value="${contentNotThree.num18}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
-                                                    、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num19" id="num19" value="${contentNotThree.num19}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
-                                                    、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num20" id="num20" value="${contentNotThree.num20}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
+                                                    远途费为每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num18" id="num18" value="${null != contentNotThree ? contentNotThree.num18 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
+                                                    、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num19" id="num19" value="${null != contentNotThree ? contentNotThree.num19 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
+                                                    、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num20" id="num20" value="${null != contentNotThree ? contentNotThree.num20 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                     <br/>
                                                 </div>
                                             </div>
@@ -555,18 +551,18 @@
                                             <div class="form-group">
                                                 <label class="col-sm-2 control-label">高峰期费用设置：</label>
                                                 <div class="col-sm-10">
-                                                    <input type="text" name="num21" id="num21" value="${contentNotThree.num21}" class="form-control newWidth" placeholder="选择时间段"/>&nbsp;
-                                                    和&nbsp;&nbsp;<input type="text" name="num22" id="num22" value="${contentNotThree.num22}" class="form-control newWidth" placeholder="选择时间段"/>&nbsp;为高峰期行车时间,
-                                                    起步价变为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num23" id="num23" value="${contentNotThree.num23}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
+                                                    <input type="text" name="num21" id="num21" value="${null != contentNotThree ? contentNotThree.num21 : ''}" class="form-control newWidth" placeholder="选择时间段"/>&nbsp;
+                                                    和&nbsp;&nbsp;<input type="text" name="num22" id="num22" value="${null != contentNotThree ? contentNotThree.num22 : ''}" class="form-control newWidth" placeholder="选择时间段"/>&nbsp;为高峰期行车时间,
+                                                    起步价变为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num23" id="num23" value="${null != contentNotThree ? contentNotThree.num23 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                     <br>
                                                     <br>
-                                                    里程费为每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num24" id="num24" value="${contentNotThree.num24}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
-                                                    时长费为每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num25" id="num25" value="${contentNotThree.num25}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
+                                                    里程费为每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num24" id="num24" value="${null != contentNotThree ? contentNotThree.num24 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
+                                                    时长费为每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num25" id="num25" value="${null != contentNotThree ? contentNotThree.num25 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                     <br>
                                                     <br>
-                                                    远途费为每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num26" id="num26" value="${contentNotThree.num26}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
-                                                    、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num27" id="num27" value="${contentNotThree.num27}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
-                                                    、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num28" id="num28" value="${contentNotThree.num28}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
+                                                    远途费为每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num26" id="num26" value="${null != contentNotThree ? contentNotThree.num26 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
+                                                    、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num27" id="num27" value="${null != contentNotThree ? contentNotThree.num27 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
+                                                    、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num28" id="num28" value="${null != contentNotThree ? contentNotThree.num28 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                     <br/>
                                                 </div>
                                             </div>
@@ -575,7 +571,7 @@
                                     <div class="form-group">
                                         <label class="col-sm-2 control-label">计价说明：</label>
                                         <div class="col-sm-10">
-                                            <textarea class="form-control" id="fareTypeNote1" name="fareTypeNote" style="height: 100px;">${item.fareTypeNote1}</textarea>
+                                            <textarea class="form-control" id="fareTypeNote1" name="fareTypeNote" style="height: 100px;">${null != item ? item.fareTypeNote1 : ''}</textarea>
                                         </div>
                                     </div>
                                     <div class="form-group">
@@ -583,7 +579,7 @@
                                         <div class="col-sm-7">
                                             <div class="form-group">
                                                 <div class="col-sm-9">
-                                                    <input type="checkbox" class="js-switch1" id="isOpen" ${item.isOpen == 1 ? 'checked=checked' : ''}/>
+                                                    <input type="checkbox" class="js-switch1" id="isOpen" ${null != item && item.isOpen == 1 ? 'checked=checked' : ''}/>
                                                 </div>
                                             </div>
                                         </div>
@@ -595,9 +591,9 @@
                                 <div class="form-group">
                                     <label class="col-sm-2 control-label">起步价设置：</label>
                                     <div class="col-sm-10">
-                                        起步价为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num1" id="num1" value="${contentExclusive.num1}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
-                                        起步包含&nbsp;<input type="text" onblur="checkIsGongLi(this, 'exclusivePriceSettings')" name="num2" id="num2" value="${contentExclusive.num2}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里,
-                                        &nbsp;<input type="text" onblur="checkIsMinute(this)" name="num3" id="num3" value="${contentExclusive.num3}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;分钟
+                                        起步价为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num1" id="num1" value="${null != contentExclusive ? contentExclusive.num1 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
+                                        起步包含&nbsp;<input type="text" onblur="checkIsGongLi(this, 'exclusivePriceSettings')" name="num2" id="num2" value="${null != contentExclusive ? contentExclusive.num2 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里,
+                                        &nbsp;<input type="text" onblur="checkIsMinute(this)" name="num3" id="num3" value="${null != contentExclusive ? contentExclusive.num3 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;分钟
                                         <br/>
                                     </div>
                                 </div>
@@ -605,7 +601,7 @@
                                 <div class="form-group">
                                     <label class="col-sm-2 control-label">里程费设置：</label>
                                     <div class="col-sm-10">
-                                        超过起步里程后每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num4" id="num4" value="${contentExclusive.num4}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
+                                        超过起步里程后每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num4" id="num4" value="${null != contentExclusive ? contentExclusive.num4 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                         <br/>
                                     </div>
                                 </div>
@@ -613,7 +609,7 @@
                                 <div class="form-group">
                                     <label class="col-sm-2 control-label">时长费设置：</label>
                                     <div class="col-sm-10">
-                                        超过起步时长后每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num5" id="num5" value="${contentExclusive.num5}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
+                                        超过起步时长后每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num5" id="num5" value="${null != contentExclusive ? contentExclusive.num5 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                         <br/>
                                     </div>
                                 </div>
@@ -621,18 +617,18 @@
                                 <div class="form-group">
                                     <label class="col-sm-2 control-label">远途费设置：</label>
                                     <div class="col-sm-10">
-                                        总里程超过&nbsp;<input type="text" onblur="checkIsGongLi(this, 'exclusivePriceSettings')" name="num6" id="num6" value="${contentExclusive.num6}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里
-                                        不足&nbsp;<input type="text" onblur="checkIsGongLi(this, 'exclusivePriceSettings')" name="num7" id="num7" value="${contentExclusive.num7}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里,
-                                        超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this, 'exclusivePriceSettings')" name="num8" id="num8" value="${contentExclusive.num8}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
+                                        总里程超过&nbsp;<input type="text" onblur="checkIsGongLi(this, 'exclusivePriceSettings')" name="num6" id="num6" value="${null != contentExclusive ? contentExclusive.num6 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里
+                                        不足&nbsp;<input type="text" onblur="checkIsGongLi(this, 'exclusivePriceSettings')" name="num7" id="num7" value="${null != contentExclusive ? contentExclusive.num7 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里,
+                                        超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this, 'exclusivePriceSettings')" name="num8" id="num8" value="${null != contentExclusive ? contentExclusive.num8 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                         <br>
                                         <br>
-                                        超过&nbsp;<input type="text" disabled onblur="checkIsGongLi(this, 'exclusivePriceSettings')" name="num9" id="num9" value="${contentExclusive.num9}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里
-                                        不足&nbsp;<input type="text" onblur="checkIsGongLi(this, 'exclusivePriceSettings')" name="num10" id="num10" value="${contentExclusive.num10}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里时,
-                                        超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num11" id="num11" value="${contentExclusive.num11}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
+                                        超过&nbsp;<input type="text" disabled onblur="checkIsGongLi(this, 'exclusivePriceSettings')" name="num9" id="num9" value="${null != contentExclusive ? contentExclusive.num9 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里
+                                        不足&nbsp;<input type="text" onblur="checkIsGongLi(this, 'exclusivePriceSettings')" name="num10" id="num10" value="${null != contentExclusive ? contentExclusive.num10 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里时,
+                                        超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num11" id="num11" value="${null != contentExclusive ? contentExclusive.num11 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                         <br/>
                                         <br>
-                                        超过&nbsp;<input type="text" disabled onblur="checkIsGongLi(this, 'exclusivePriceSettings')" name="num12" id="num12" value="${contentExclusive.num12}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里以后,
-                                        超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num13" id="num13" value="${contentExclusive.num13}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
+                                        超过&nbsp;<input type="text" disabled onblur="checkIsGongLi(this, 'exclusivePriceSettings')" name="num12" id="num12" value="${null != contentExclusive ? contentExclusive.num12 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里以后,
+                                        超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num13" id="num13" value="${null != contentExclusive ? contentExclusive.num13 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                         <br/>
                                     </div>
                                 </div>
@@ -640,17 +636,17 @@
                                 <div class="form-group">
                                     <label class="col-sm-2 control-label">夜间行驶费用设置：</label>
                                     <div class="col-sm-10">
-                                        <input type="text" name="num14" id="num14" value="${contentExclusive.num14}" class="form-control newWidth" placeholder="选择时间"/>&nbsp;点为夜间行驶时间,
-                                        起步价变为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num15" id="num15" value="${contentExclusive.num15}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
+                                        <input type="text" name="num14" id="num14" value="${null != contentExclusive ? contentExclusive.num14 : ''}" class="form-control newWidth" placeholder="选择时间"/>&nbsp;点为夜间行驶时间,
+                                        起步价变为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num15" id="num15" value="${null != contentExclusive ? contentExclusive.num15 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                         <br>
                                         <br>
-                                        里程费为每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num16" id="num16" value="${contentExclusive.num16}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
-                                        时长费为每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num17" id="num17" value="${contentExclusive.num17}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
+                                        里程费为每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num16" id="num16" value="${null != contentExclusive ? contentExclusive.num16 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
+                                        时长费为每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num17" id="num17" value="${null != contentExclusive ? contentExclusive.num17 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                         <br>
                                         <br>
-                                        远途费为每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num18" id="num18" value="${contentExclusive.num18}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
-                                        、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num19" id="num19" value="${contentExclusive.num19}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
-                                        、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num20" id="num20" value="${contentExclusive.num20}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
+                                        远途费为每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num18" id="num18" value="${null != contentExclusive ? contentExclusive.num18 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
+                                        、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num19" id="num19" value="${null != contentExclusive ? contentExclusive.num19 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
+                                        、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num20" id="num20" value="${null != contentExclusive ? contentExclusive.num20 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                         <br/>
                                     </div>
                                 </div>
@@ -658,18 +654,18 @@
                                 <div class="form-group">
                                     <label class="col-sm-2 control-label">高峰期费用设置：</label>
                                     <div class="col-sm-10">
-                                        <input type="text" name="num21" id="num21" value="${contentExclusive.num21}" class="form-control newWidth" placeholder="选择时间段"/>&nbsp;
-                                        和&nbsp;&nbsp;<input type="text" name="num22" id="num22" value="${contentExclusive.num22}" class="form-control newWidth" placeholder="选择时间段"/>&nbsp;为高峰期行车时间,
-                                        起步价变为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num23" id="num23" value="${contentExclusive.num23}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
+                                        <input type="text" name="num21" id="num21" value="${null != contentExclusive ? contentExclusive.num21 : ''}" class="form-control newWidth" placeholder="选择时间段"/>&nbsp;
+                                        和&nbsp;&nbsp;<input type="text" name="num22" id="num22" value="${null != contentExclusive ? contentExclusive.num22 : ''}" class="form-control newWidth" placeholder="选择时间段"/>&nbsp;为高峰期行车时间,
+                                        起步价变为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num23" id="num23" value="${null != contentExclusive ? contentExclusive.num23 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                         <br>
                                         <br>
-                                        里程费为每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num24" id="num24" value="${contentExclusive.num24}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
-                                        时长费为每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num25" id="num25" value="${contentExclusive.num25}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
+                                        里程费为每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num24" id="num24" value="${null != contentExclusive ? contentExclusive.num24 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
+                                        时长费为每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num25" id="num25" value="${null != contentExclusive ? contentExclusive.num25 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                         <br>
                                         <br>
-                                        远途费为每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num26" id="num26" value="${contentExclusive.num26}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
-                                        、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num27" id="num27" value="${contentExclusive.num27}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
-                                        、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num28" id="num28" value="${contentExclusive.num28}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
+                                        远途费为每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num26" id="num26" value="${null != contentExclusive ? contentExclusive.num26 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
+                                        、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num27" id="num27" value="${null != contentExclusive ? contentExclusive.num27 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
+                                        、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num28" id="num28" value="${null != contentExclusive ? contentExclusive.num28 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                         <br/>
                                     </div>
                                 </div>
@@ -677,7 +673,7 @@
                                 <div class="form-group">
                                     <label class="col-sm-2 control-label">计价说明：</label>
                                     <div class="col-sm-10">
-                                        <textarea class="form-control" id="fareTypeNote2" name="fareTypeNote" style="height: 100px;">${item.fareTypeNote2}</textarea>
+                                        <textarea class="form-control" id="fareTypeNote2" name="fareTypeNote" style="height: 100px;">${null != item ? item.fareTypeNote2 : ''}</textarea>
                                     </div>
                                 </div>
                                 <div class="form-group">
@@ -685,7 +681,7 @@
                                     <div class="col-sm-7">
                                         <div class="form-group">
                                             <div class="col-sm-9">
-                                                <input type="checkbox" class="js-switch2" id="isOpenExclusive" ${item.isOpenExclusive == 1 ? 'checked=checked' : ''}/>
+                                                <input type="checkbox" class="js-switch2" id="isOpenExclusive" ${null != item && item.isOpenExclusive == 1 ? 'checked=checked' : ''}/>
                                             </div>
                                         </div>
                                     </div>
@@ -696,9 +692,9 @@
                                 <div class="form-group">
                                     <label class="col-sm-2 control-label">起步价设置：</label>
                                     <div class="col-sm-10">
-                                        起步价为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num1" id="num1" value="${contentPrice.num1}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
-                                        起步包含&nbsp;<input type="text" onblur="checkIsGongLi(this, 'onePriceSetting')" name="num2" id="num2" value="${contentPrice.num2}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里,
-                                        &nbsp;<input type="text" onblur="checkIsMinute(this)" name="num3" id="num3" value="${contentPrice.num3}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;分钟
+                                        起步价为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num1" id="num1" value="${null != contentPrice ? contentPrice.num1 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
+                                        起步包含&nbsp;<input type="text" onblur="checkIsGongLi(this, 'onePriceSetting')" name="num2" id="num2" value="${null != contentPrice ? contentPrice.num2 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里,
+                                        &nbsp;<input type="text" onblur="checkIsMinute(this)" name="num3" id="num3" value="${null != contentPrice ? contentPrice.num3 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;分钟
                                         <br/>
                                     </div>
                                 </div>
@@ -706,7 +702,7 @@
                                 <div class="form-group">
                                     <label class="col-sm-2 control-label">里程费设置：</label>
                                     <div class="col-sm-10">
-                                        超过起步里程后每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num4" id="num4" value="${contentPrice.num4}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
+                                        超过起步里程后每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num4" id="num4" value="${null != contentPrice ? contentPrice.num4 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                         <br/>
                                     </div>
                                 </div>
@@ -714,7 +710,7 @@
                                 <div class="form-group">
                                     <label class="col-sm-2 control-label">时长费设置：</label>
                                     <div class="col-sm-10">
-                                        超过起步时长后每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num5" id="num5" value="${contentPrice.num5}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
+                                        超过起步时长后每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num5" id="num5" value="${null != contentPrice ? contentPrice.num5 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                         <br/>
                                     </div>
                                 </div>
@@ -722,18 +718,18 @@
                                 <div class="form-group">
                                     <label class="col-sm-2 control-label">远途费设置：</label>
                                     <div class="col-sm-10">
-                                        总里程超过&nbsp;<input type="text" onblur="checkIsGongLi(this, 'onePriceSetting')" name="num6" id="num6" value="${contentPrice.num6}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里
-                                        不足&nbsp;<input type="text" onblur="checkIsGongLi(this, 'onePriceSetting')" name="num7" id="num7" value="${contentPrice.num7}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里,
-                                        超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num8" id="num8" value="${contentPrice.num8}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
+                                        总里程超过&nbsp;<input type="text" onblur="checkIsGongLi(this, 'onePriceSetting')" name="num6" id="num6" value="${null != contentPrice ? contentPrice.num6 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里
+                                        不足&nbsp;<input type="text" onblur="checkIsGongLi(this, 'onePriceSetting')" name="num7" id="num7" value="${null != contentPrice ? contentPrice.num7 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里,
+                                        超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num8" id="num8" value="${null != contentPrice ? contentPrice.num8 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                         <br>
                                         <br>
-                                        超过&nbsp;<input type="text" disabled onblur="checkIsGongLi(this, 'onePriceSetting')" name="num9" id="num9" value="${contentPrice.num9}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里
-                                        不足&nbsp;<input type="text" onblur="checkIsGongLi(this, 'onePriceSetting')" name="num10" id="num10" value="${contentPrice.num10}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里时,
-                                        超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num11" id="num11" value="${contentPrice.num11}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
+                                        超过&nbsp;<input type="text" disabled onblur="checkIsGongLi(this, 'onePriceSetting')" name="num9" id="num9" value="${null != contentPrice ? contentPrice.num9 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里
+                                        不足&nbsp;<input type="text" onblur="checkIsGongLi(this, 'onePriceSetting')" name="num10" id="num10" value="${null != contentPrice ? contentPrice.num10 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里时,
+                                        超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num11" id="num11" value="${null != contentPrice ? contentPrice.num11 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                         <br/>
                                         <br>
-                                        超过&nbsp;<input type="text" disabled onblur="checkIsGongLi(this, 'onePriceSetting')" name="num12" id="num12" value="${contentPrice.num12}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里以后,
-                                        超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num13" id="num13" value="${contentPrice.num13}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
+                                        超过&nbsp;<input type="text" disabled onblur="checkIsGongLi(this, 'onePriceSetting')" name="num12" id="num12" value="${null != contentPrice ? contentPrice.num12 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里以后,
+                                        超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num13" id="num13" value="${null != contentPrice ? contentPrice.num13 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                         <br/>
                                     </div>
                                 </div>
@@ -741,17 +737,17 @@
                                 <div class="form-group">
                                     <label class="col-sm-2 control-label">夜间行驶费用设置：</label>
                                     <div class="col-sm-10">
-                                        <input type="text" name="num14" id="num14" value="${contentPrice.num14}" class="form-control newWidth" placeholder="选择时间"/>&nbsp;点为夜间行驶时间,
-                                        起步价变为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num15" id="num15" value="${contentPrice.num15}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
+                                        <input type="text" name="num14" id="num14" value="${null != contentPrice ? contentPrice.num14 : ''}" class="form-control newWidth" placeholder="选择时间"/>&nbsp;点为夜间行驶时间,
+                                        起步价变为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num15" id="num15" value="${null != contentPrice ? contentPrice.num15 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                         <br>
                                         <br>
-                                        里程费为每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num16" id="num16" value="${contentPrice.num16}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
-                                        时长费为每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num17" id="num17" value="${contentPrice.num17}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
+                                        里程费为每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num16" id="num16" value="${null != contentPrice ? contentPrice.num16 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
+                                        时长费为每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num17" id="num17" value="${null != contentPrice ? contentPrice.num17 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                         <br>
                                         <br>
-                                        远途费为每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num18" id="num18" value="${contentPrice.num18}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
-                                        、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num19" id="num19" value="${contentPrice.num19}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
-                                        、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num20" id="num20" value="${contentPrice.num20}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
+                                        远途费为每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num18" id="num18" value="${null != contentPrice ? contentPrice.num18 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
+                                        、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num19" id="num19" value="${null != contentPrice ? contentPrice.num19 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
+                                        、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num20" id="num20" value="${null != contentPrice ? contentPrice.num20 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                         <br/>
                                     </div>
                                 </div>
@@ -759,18 +755,18 @@
                                 <div class="form-group">
                                     <label class="col-sm-2 control-label">高峰期费用设置：</label>
                                     <div class="col-sm-10">
-                                        <input type="text" name="num21" id="num21" value="${contentPrice.num21}" class="form-control newWidth" placeholder="选择时间段"/>&nbsp;
-                                        和&nbsp;&nbsp;<input type="text" name="num22" id="num22" value="${contentPrice.num22}" class="form-control newWidth" placeholder="选择时间段"/>&nbsp;为高峰期行车时间,
-                                        起步价变为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num23" id="num23" value="${contentPrice.num23}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
+                                        <input type="text" name="num21" id="num21" value="${null != contentPrice ? contentPrice.num21 : ''}" class="form-control newWidth" placeholder="选择时间段"/>&nbsp;
+                                        和&nbsp;&nbsp;<input type="text" name="num22" id="num22" value="${null != contentPrice ? contentPrice.num22 : ''}" class="form-control newWidth" placeholder="选择时间段"/>&nbsp;为高峰期行车时间,
+                                        起步价变为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num23" id="num23" value="${null != contentPrice ? contentPrice.num23 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                         <br>
                                         <br>
-                                        里程费为每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num24" id="num24" value="${contentPrice.num24}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
-                                        时长费为每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num25" id="num25" value="${contentPrice.num25}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
+                                        里程费为每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num24" id="num24" value="${null != contentPrice ? contentPrice.num24 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
+                                        时长费为每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num25" id="num25" value="${null != contentPrice ? contentPrice.num25 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                         <br>
                                         <br>
-                                        远途费为每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num26" id="num26" value="${contentPrice.num26}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
-                                        、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num27" id="num27" value="${contentPrice.num27}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
-                                        、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num28" id="num28" value="${contentPrice.num28}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
+                                        远途费为每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num26" id="num26" value="${null != contentPrice ? contentPrice.num26 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
+                                        、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num27" id="num27" value="${null != contentPrice ? contentPrice.num27 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
+                                        、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num28" id="num28" value="${null != contentPrice ? contentPrice.num28 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                         <br/>
                                     </div>
                                 </div>
@@ -778,16 +774,16 @@
                                 <div class="form-group">
                                     <label class="col-sm-2 control-label">超过预估里程设置：</label>
                                     <div class="col-sm-10">
-                                        超过预估里程&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num29" id="num29" value="${contentPrice.num29}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里以内，按一口价计算
+                                        超过预估里程&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num29" id="num29" value="${null != contentPrice ? contentPrice.num29 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里以内，按一口价计算
                                         <br>
                                         <br>
-                                        超过预估里程&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num30" id="num30" value="${contentPrice.num30}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里以上，按实时计价计算
+                                        超过预估里程&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num30" id="num30" value="${null != contentPrice ? contentPrice.num30 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里以上，按实时计价计算
                                         <br>
                                         <br>
-                                        低于预估里程&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num31" id="num31" value="${contentPrice.num31}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里以上，按实时计价计算
+                                        低于预估里程&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num31" id="num31" value="${null != contentPrice ? contentPrice.num31 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里以上，按实时计价计算
                                         <br>
                                         <br>
-                                        低于预估里程&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num32" id="num32" value="${contentPrice.num32}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里以内，按一口价计算
+                                        低于预估里程&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num32" id="num32" value="${null != contentPrice ? contentPrice.num32 : ''}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里以内，按一口价计算
                                         <br>
                                         <br>
                                     </div>
@@ -795,7 +791,7 @@
                                 <div class="form-group">
                                     <label class="col-sm-2 control-label">计价说明：</label>
                                     <div class="col-sm-10">
-                                        <textarea class="form-control" id="fareTypeNote3" name="fareTypeNote" style="height: 100px;">${item.fareTypeNote3}</textarea>
+                                        <textarea class="form-control" id="fareTypeNote3" name="fareTypeNote" style="height: 100px;">${null != item ? item.fareTypeNote3 : ''}</textarea>
                                     </div>
                                 </div>
                                 <div class="form-group">
@@ -803,7 +799,7 @@
                                     <div class="col-sm-7">
                                         <div class="form-group">
                                             <div class="col-sm-9">
-                                                <input type="checkbox" class="js-switch3" id="isOpenPrice" ${item.isOpenExclusive == 1 ? 'checked=checked' : ''}/>
+                                                <input type="checkbox" class="js-switch3" id="isOpenPrice" ${null != item && item.isOpenExclusive == 1 ? 'checked=checked' : ''}/>
                                             </div>
                                         </div>
                                     </div>
@@ -817,7 +813,7 @@
 
             <div class="row btn-group-m-t">
                 <div class="col-sm-10 col-sm-offset-5">
-                    <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TSystemPriceInfoDlg.editSubmit()"/>
+                    <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TSystemPriceInfoDlg.addSubmit()"/>
                     <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TSystemPriceInfoDlg.close()"/>
                 </div>
             </div>
diff --git a/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/taxiSet.html b/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/taxiSet.html
index a164a6c..a152350 100644
--- a/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/taxiSet.html
+++ b/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/taxiSet.html
@@ -90,7 +90,6 @@
             <div class="row btn-group-m-t">
                 <div class="col-sm-10 col-sm-offset-5">
                     <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="addTaxiSubmit()"/>
-<!--                    <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TSystemPriceInfoDlg.close()"/>-->
                 </div>
             </div>
         </div>
@@ -121,27 +120,12 @@
         });
         waitFee = waitFee.substring(0,waitFee.length-1);
         waitFee += '}';
-        console.log(waitFee);
+        console.log(btoa(waitFee));
 
-
-
-        //提交信息
-        var ajax = new $ax(Feng.ctxPath + "/tSystemPrice/taxiSet", function(data){
-            if (500 == data.code){
-                Feng.error(data.message);
-                return;
-            }else{
-                Feng.success("添加成功!");
-                window.parent.TSystemPrice.table.refresh();
-                TSystemPriceInfoDlg.close();
-            }
-        },function(data){
-            Feng.error("添加失败!" + data.responseJSON.message + "!");
-        });
-        ajax.setData({
-            content: waitFee
-        })
-        ajax.start();
+		window.parent.document.getElementById("zc_price").value = btoa(waitFee);
+	    window.parent.document.getElementById("czc_status").innerText = "已设置";
+	    window.parent.document.getElementById("czc_set").innerText = "修改";
+	    parent.layer.close(window.parent.TOpenCityInfoDlg.layerIndex);
     }
 
     laydate.render({
diff --git a/ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tSystemPrice/systemPriceCity.js b/ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tSystemPrice/systemPriceCity.js
new file mode 100644
index 0000000..4ec63b5
--- /dev/null
+++ b/ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tSystemPrice/systemPriceCity.js
@@ -0,0 +1,154 @@
+/**
+ * 城市管理管理初始化
+ */
+var TOpenCity = {
+	id: "TOpenCityTable",	//表格id
+	seItem: null,		//选中的条目
+	table: null,
+	layerIndex: -1
+};
+
+/**
+ * 初始化表格的列
+ */
+TOpenCity.initColumn = function () {
+	return [
+		{field: 'selectItem', radio: true},
+		{title: '主键ID', field: 'id', visible: false, align: 'center', valign: 'middle'},
+		{title: '添加时间', field: 'insertTime', visible: true, align: 'center', valign: 'middle',width:'10%'},
+		{title: '省', field: 'areaName', visible: true, align: 'center', valign: 'middle',
+			formatter: function (value, row) {
+				var btn = "";
+				if(row.areaName != '' && row.areaName != null) {
+					btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.areaName + '" onfocus="TUser.tooltip()">' + row.areaName + '</p>']
+				}
+				return btn;
+			}
+		},
+		{title: '市', field: 'cityName', visible: true, align: 'center', valign: 'middle',
+			formatter: function (value, row) {
+				var btn = "";
+				if(row.cityName != '' && row.cityName != null) {
+					btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.cityName + '" onfocus="TUser.tooltip()">' + row.cityName + '</p>']
+				}
+				return btn;
+			}
+		},
+		{title: '区', field: 'provinceName', visible: true, align: 'center', valign: 'middle',
+			formatter: function (value, row) {
+				var btn = "";
+				if(row.provinceName != '' && row.provinceName != null) {
+					btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.provinceName + '" onfocus="TUser.tooltip()">' + row.provinceName + '</p>']
+				}
+				return btn;
+			}
+		},
+		{title: '操作', field: 'id', visible: true, align: 'center', valign: 'middle',
+			formatter: function (value, row) {
+				var btn = "<a href='#' onclick='TOpenCity.openTOpenCityDetail(" + value + ")' style='color:blue;'>编辑</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href='#' onclick='TOpenCity.delete(" + value + ")' style='color:blue;'>删除</a>";
+				return btn;
+			}
+		}
+	];
+};
+
+/**
+ * 检查是否选中
+ */
+TOpenCity.check = function () {
+	var selected = $('#' + this.id).bootstrapTable('getSelections');
+	if(selected.length == 0){
+		Feng.info("请先选中表格中的某一记录！");
+		return false;
+	}else{
+		TOpenCity.seItem = selected[0];
+		return true;
+	}
+};
+
+/**
+ * 点击添加城市管理
+ */
+TOpenCity.openAddTOpenCity = function () {
+	var index = layer.open({
+		type: 2,
+		title: '添加价格',
+		area: ['100%', '100%'], //宽高
+		fix: false, //不固定
+		maxmin: true,
+		content: Feng.ctxPath + '/tSystemPrice/systemPriceCity_add'
+	});
+	this.layerIndex = index;
+};
+
+/**
+ * 打开查看城市管理详情
+ */
+TOpenCity.openTOpenCityDetail = function (id) {
+	if (null == id && this.check()) {
+		id = TOpenCity.seItem.id;
+	}
+	if(null != id){
+		var index = layer.open({
+			type: 2,
+			title: '编辑价格',
+			area: ['100%', '100%'], //宽高
+			fix: false, //不固定
+			maxmin: true,
+			content: Feng.ctxPath + '/tSystemPrice/systemPriceCity_update?id=' + id
+		});
+		this.layerIndex = index;
+	}
+};
+
+/**
+ * 删除城市管理
+ */
+TOpenCity.delete = function (id) {
+	if (null == id && this.check()) {
+		id = TOpenCity.seItem.id;
+	}
+	if(null != id){
+		var name = "该价格设置";
+		swal({
+			title: "您是否确认删除" + name + "?",
+			text: "请谨慎操作,删除后不可恢复！",
+			type: "warning",
+			showCancelButton: true,
+			confirmButtonColor: "#DD6B55",
+			confirmButtonText: "删除",
+			closeOnConfirm: false
+		}, function () {
+			var ajax = new $ax(Feng.ctxPath + "/tSystemPrice/opt", function (data) {
+				swal("删除成功", "您已经成功删除了" + name + "。", "success");
+				TOpenCity.table.refresh();
+			}, function (data) {
+				swal("删除失败", data.responseJSON.message + "！", "warning");
+			});
+			ajax.set("id", id);
+			ajax.start();
+		});
+	}
+};
+
+/**
+ * 查询城市管理列表
+ */
+TOpenCity.search = function () {
+	var queryData = {};
+	queryData['insertTime'] = $("#insertTime").val();
+	queryData['condition'] = $("#condition").val();
+	TOpenCity.table.refresh({query: queryData});
+};
+TOpenCity.resetSearch = function () {
+	$("#insertTime").val("");
+	$("#condition").val("");
+	TOpenCity.search();
+};
+
+$(function () {
+	var defaultColunms = TOpenCity.initColumn();
+	var table = new BSTable(TOpenCity.id, "/tSystemPrice/queryList", defaultColunms);
+	table.setPaginationType("server");
+	TOpenCity.table = table.init();
+});
diff --git a/ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tSystemPrice/systemPriceCity_info.js b/ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tSystemPrice/systemPriceCity_info.js
new file mode 100644
index 0000000..3b219f8
--- /dev/null
+++ b/ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tSystemPrice/systemPriceCity_info.js
@@ -0,0 +1,262 @@
+/**
+ * 初始化城市管理详情对话框
+ */
+var TOpenCityInfoDlg = {
+	tOpenCityInfoData : {},
+	editor: null,
+	validateFields: {
+		areaCode: {
+			validators: {
+				notEmpty: {
+					message: '请选择省'
+				}
+			}
+		}
+	}
+};
+
+/**
+ * 验证数据是否为空
+ */
+TOpenCityInfoDlg.validate = function () {
+	$('#openCityForm').data("bootstrapValidator").resetForm();
+	$('#openCityForm').bootstrapValidator('validate');
+	return $("#openCityForm").data('bootstrapValidator').isValid();
+};
+
+
+/**
+ * 清除数据
+ */
+TOpenCityInfoDlg.clearData = function() {
+	this.tOpenCityInfoData = {};
+}
+
+/**
+ * 设置对话框中的数据
+ *
+ * @param key 数据的名称
+ * @param val 数据的具体值
+ */
+TOpenCityInfoDlg.set = function(key, val) {
+	this.tOpenCityInfoData[key] = (typeof val == "undefined") ? $("#" + key).val() : val;
+	return this;
+}
+
+/**
+ * 设置对话框中的数据
+ *
+ * @param key 数据的名称
+ * @param val 数据的具体值
+ */
+TOpenCityInfoDlg.get = function(key) {
+	return $("#" + key).val();
+}
+
+/**
+ * 关闭此对话框
+ */
+TOpenCityInfoDlg.close = function() {
+	parent.layer.close(window.parent.TOpenCity.layerIndex);
+}
+
+/**
+ * 收集数据
+ */
+TOpenCityInfoDlg.collectData = function() {
+	this
+			.set('id')
+			.set('areaCode')
+			.set('cityCode')
+			.set('provinceCode')
+}
+
+
+TOpenCityInfoDlg.openAddTextPrice = function () {
+	var index = layer.open({
+		type: 2,
+		title: '添加出租车价格',
+		area: ['100%', '100%'], //宽高
+		fix: false, //不固定
+		maxmin: true,
+		content: Feng.ctxPath + '/tSystemPrice/taxi?price=' + $('#zc_price').val()
+	});
+	this.layerIndex = index;
+};
+
+
+TOpenCityInfoDlg.openAddTZCPrice = function (id){
+	var index = layer.open({
+		type: 2,
+		title: '添加专车价格',
+		area: ['100%', '100%'], //宽高
+		fix: false, //不固定
+		maxmin: true,
+		content: Feng.ctxPath + '/tSystemPrice/tSystemPrice_add?id=' + id + "&price=" + $('#' + id).val()
+	});
+	this.layerIndex = index;
+}
+
+
+
+
+/**
+ * 提交添加
+ */
+TOpenCityInfoDlg.addSubmit = function() {
+	
+	this.clearData();
+	this.collectData();
+	if(!this.validate()){
+		return ;
+	}
+	var zcArr=[];
+	$("#coun tr").each(function () {
+		var value = $(this).find("input[name='price']").val();
+		if('' != value && null != value){
+			zcArr.push(JSON.parse(atob(value)))
+		}
+	});
+	if(zcArr.length == 0){
+		Feng.error("请配置专车价格")
+		return;
+	}
+	
+	console.log(zcArr);
+	var zczArr = $('#zc_price').val();
+	if(null == zczArr || zczArr == ''){
+		Feng.error("请配置出租车价格")
+		return;
+	}
+	if(null != this.tOpenCityInfoData.areaCode && '' != this.tOpenCityInfoData.areaCode){
+		this.tOpenCityInfoData.areaName = $('#areaCode').find('option:selected').text();
+	}
+	if(null != this.tOpenCityInfoData.cityCode && '' != this.tOpenCityInfoData.cityCode){
+		this.tOpenCityInfoData.cityName = $('#cityCode').find('option:selected').text();
+	}
+	if(null != this.tOpenCityInfoData.provinceCode && '' != this.tOpenCityInfoData.provinceCode){
+		this.tOpenCityInfoData.provinceName = $('#provinceCode').find('option:selected').text();
+	}
+	
+	//提交信息
+	var ajax = new $ax(Feng.ctxPath + "/tSystemPrice/add", function(data){
+		Feng.success("添加成功!");
+		window.parent.TOpenCity.table.refresh();
+		TOpenCityInfoDlg.close();
+	},function(data){
+		Feng.error("添加失败!" + data.responseJSON.message + "!");
+	});
+	ajax.set(this.tOpenCityInfoData);
+	ajax.set("zcPrice",JSON.stringify(zcArr));
+	ajax.set("czcPrice", atob(zczArr));
+	ajax.start();
+}
+
+/**
+ * 提交修改
+ */
+TOpenCityInfoDlg.editSubmit = function() {
+	this.clearData();
+	this.collectData();
+	if(!this.validate()){
+		return ;
+	}
+	var zcArr=[];
+	$("#coun tr").each(function () {
+		var value = $(this).find("input[name='price']").val();
+		if('' != value && null != value){
+			zcArr.push(JSON.parse(atob(value)))
+		}
+	});
+	if(zcArr.length == 0){
+		Feng.error("请配置专车价格")
+		return;
+	}
+	
+	console.log(zcArr);
+	var zczArr = $('#zc_price').val();
+	if(null == zczArr || zczArr == ''){
+		Feng.error("请配置出租车价格")
+		return;
+	}
+	if(null != this.tOpenCityInfoData.areaCode && '' != this.tOpenCityInfoData.areaCode){
+		this.tOpenCityInfoData.areaName = $('#areaCode').find('option:selected').text();
+	}
+	if(null != this.tOpenCityInfoData.cityCode && '' != this.tOpenCityInfoData.cityCode){
+		this.tOpenCityInfoData.cityName = $('#cityCode').find('option:selected').text();
+	}
+	if(null != this.tOpenCityInfoData.provinceCode && '' != this.tOpenCityInfoData.provinceCode){
+		this.tOpenCityInfoData.provinceName = $('#provinceCode').find('option:selected').text();
+	}
+	
+	//提交信息
+	var ajax = new $ax(Feng.ctxPath + "/tSystemPrice/update", function(data){
+		Feng.success("修改成功!");
+		window.parent.TOpenCity.table.refresh();
+		TOpenCityInfoDlg.close();
+	},function(data){
+		Feng.error("添加失败!" + data.responseJSON.message + "!");
+	});
+	ajax.set(this.tOpenCityInfoData);
+	ajax.set("zcPrice",JSON.stringify(zcArr));
+	ajax.set("czcPrice", atob(zczArr));
+	ajax.start();
+}
+
+$(function() {
+	Feng.initValidator("openCityForm", TOpenCityInfoDlg.validateFields);
+});
+
+/**
+ * 省改变时执行
+ */
+TOpenCityInfoDlg.provinceChange = function () {
+	var provinceId = $("#areaCode").val();
+	var ajax = new $ax(Feng.ctxPath + "/tOpenCity/change", function(data){
+		if(data!=null){
+			var content='<option value="">选择市</option>';
+			$.each(data, function(k,v) {
+				content += "<option value='"+v.id+"'>"+v.name+"</option>";
+			});
+			$("#cityCode").empty().append(content);
+			$("#provinceCode").empty().append('<option value="">选择区</option>');
+		}
+	});
+	ajax.set("id",provinceId);
+	ajax.start();
+}
+/**
+ * 市改变时执行
+ */
+TOpenCityInfoDlg.cityChange = function () {
+	var cityId = $("#cityCode").val();
+	var ajax = new $ax(Feng.ctxPath + "/tOpenCity/change", function(data){
+		if(data!=null){
+			var content='<option value="">选择区</option>';
+			$.each(data, function(k,v) {
+				content += "<option value='"+v.id+"'>"+v.name+"</option>";
+			});
+			$("#provinceCode").empty().append(content);
+		}
+	});
+	ajax.set("id",cityId);
+	ajax.start();
+}
+
+
+//获取当前时间，格式YYYY-MM-DD
+function getNowFormatDate() {
+	var date = new Date();
+	var seperator1 = "-";
+	var year = date.getFullYear();
+	var month = date.getMonth() + 1;
+	var strDate = date.getDate();
+	if (month >= 1 && month <= 9) {
+		month = "0" + month;
+	}
+	if (strDate >= 0 && strDate <= 9) {
+		strDate = "0" + strDate;
+	}
+	var currentdate = year + seperator1 + month + seperator1 + strDate;
+	return currentdate;
+}
\ No newline at end of file
diff --git a/ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tSystemPrice/tSystemPrice_info.js b/ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tSystemPrice/tSystemPrice_info.js
index 252894c..231b3a3 100644
--- a/ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tSystemPrice/tSystemPrice_info.js
+++ b/ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tSystemPrice/tSystemPrice_info.js
@@ -119,7 +119,7 @@
  * 关闭此对话框
  */
 TSystemPriceInfoDlg.close = function() {
-    parent.layer.close(window.parent.TSystemPrice.layerIndex);
+    parent.layer.close(window.parent.TOpenCityInfoDlg.layerIndex);
 }
 
 /**
@@ -322,21 +322,7 @@
         isOpenPrice = 2;
     }
 
-
-    //提交信息
-    var ajax = new $ax(Feng.ctxPath + "/tSystemPrice/add", function(data){
-        if (500 == data.code){
-            Feng.error(data.message);
-            return;
-        }else{
-            Feng.success("添加成功!");
-            window.parent.TSystemPrice.table.refresh();
-            TSystemPriceInfoDlg.close();
-        }
-    },function(data){
-        Feng.error("添加失败!" + data.responseJSON.message + "!");
-    });
-    ajax.setData({
+    var jsonStr = {
         serverCarModelId: serverCarModelId,
         content: waitFee,
         fareTypeNote1: fareTypeNote1,
@@ -353,8 +339,12 @@
         isOpen: isOpen,
         isOpenExclusive: isOpenExclusive,
         isOpenPrice: isOpenPrice
-    })
-    ajax.start();
+    };
+    window.parent.document.getElementById(serverCarModelId).value = btoa(JSON.stringify(jsonStr));
+    window.parent.document.getElementById("zc_status_" + serverCarModelId).innerText = "已设置";
+    window.parent.document.getElementById("zc_set_" + serverCarModelId).innerText = "修改";
+    TSystemPriceInfoDlg.close();
+    
 }
 
 /**

--
Gitblit v1.7.1