diff --git a/ruoyi-admin/src/main/java/com/ruoyi/operation/domain/CompanyStore.java b/ruoyi-admin/src/main/java/com/ruoyi/operation/domain/CompanyStore.java
index 0ca7f03..e3fdb64 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/operation/domain/CompanyStore.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/operation/domain/CompanyStore.java
@@ -57,7 +57,7 @@ public class CompanyStore extends BaseEntity
     private String cityName;
 
     /** 区县 */
-    private Long areaId;
+    private String areaId;
 
     /** 城市 */
     @Excel(name = "城市")
@@ -127,7 +127,7 @@ public class CompanyStore extends BaseEntity
     private Long operatingCompanyId;
 
     /** 运营性质 1.直营 0.合作 */
-    @Excel(name = "运营性质 1.直营 0.合作")
+    @Excel(name = "运营性质")
     private Integer operatingNature;
 
     /** 简介 */
@@ -143,36 +143,28 @@ public class CompanyStore extends BaseEntity
     private String storeNumber;
 
     /** 营业执照 */
-    @Excel(name = "营业执照")
     private String businessLicenseImg;
 
     /** 审核状态 0.未审核 1.审核通过 2.审核未通过 */
-    @Excel(name = "审核状态 0.未审核 1.审核通过 2.审核未通过")
     private Integer auditStatus;
 
     /** 审核时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "审核时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date auditTime;
 
     /** 审核人id */
-    @Excel(name = "审核人id")
     private Long auditorId;
 
     /** 所属用户id */
-    @Excel(name = "所属用户id")
     private Long userId;
 
     /** 是否允许回收退租天数 0.不允许 1.允许 */
-    @Excel(name = "是否允许回收退租天数 0.不允许 1.允许")
     private Integer isReturnAllowed;
 
     /** 企业套餐保证金 */
-    @Excel(name = "企业套餐保证金")
     private BigDecimal mealDepositPrice;
 
     /** 企业充值订单数限制 */
-    @Excel(name = "企业充值订单数限制")
     private Long orderNumLimit;
 
     /**  */
@@ -285,11 +277,11 @@ public class CompanyStore extends BaseEntity
         this.cityName = cityName;
     }
 
-    public Long getAreaId() {
+    public String getAreaId() {
         return areaId;
     }
 
-    public void setAreaId(Long areaId) {
+    public void setAreaId(String areaId) {
         this.areaId = areaId;
     }
 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/operation/service/impl/CompanyStoreServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/operation/service/impl/CompanyStoreServiceImpl.java
index cf9e3c8..65836bc 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/operation/service/impl/CompanyStoreServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/operation/service/impl/CompanyStoreServiceImpl.java
@@ -2,6 +2,9 @@ package com.ruoyi.operation.service.impl;
 
 import java.util.List;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.system.domain.SysAreaHn;
+import com.ruoyi.system.service.ISysAreaHnService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.operation.mapper.CompanyStoreMapper;
@@ -20,7 +23,8 @@ public class CompanyStoreServiceImpl implements ICompanyStoreService
 {
     @Autowired
     private CompanyStoreMapper companyStoreMapper;
-
+    @Autowired
+    private ISysAreaHnService sysAreaHnService;
     /**
      * 查询门店
      * 
@@ -56,14 +60,22 @@ public class CompanyStoreServiceImpl implements ICompanyStoreService
     {
         companyStore.setCreateTime(DateUtils.getNowDate());
         companyStore.setUpdateTime(DateUtils.getNowDate());
-        if(companyStore.getAuditStatus().equals("1")){
-            companyStore.setStatus("0");
-        }else{
-            companyStore.setStatus("0");
-        }
+        companyStore.setStatus("0");
+
+        setAreaInfo(companyStore);
         return companyStoreMapper.insertCompanyStore(companyStore);
     }
 
+    private void setAreaInfo(CompanyStore companyStore){
+        //获取当前区划
+        String areaCode = companyStore.getAreaId();
+        SysAreaHn areaHn = sysAreaHnService.selectSysAreaHnByCode(areaCode.substring(0,4)+"00000000");
+        companyStore.setCityId(areaHn.getAreaCode());
+        companyStore.setCityName(areaHn.getName());
+        companyStore.setProvinceId(areaHn.getParentCode());
+        companyStore.setProvinceName(areaHn.getParentName());
+    }
+
     /**
      * 修改门店
      * 
@@ -74,11 +86,9 @@ public class CompanyStoreServiceImpl implements ICompanyStoreService
     public int updateCompanyStore(CompanyStore companyStore)
     {
         companyStore.setUpdateTime(DateUtils.getNowDate());
-        if(companyStore.getAuditStatus().equals("1")){
-            companyStore.setStatus("0");
-        }else{
-            companyStore.setStatus("0");
-        }
+        companyStore.setStatus("0");
+
+        setAreaInfo(companyStore);
         return companyStoreMapper.updateCompanyStore(companyStore);
     }
 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/orders/domain/ZcOrderMain.java b/ruoyi-admin/src/main/java/com/ruoyi/orders/domain/ZcOrderMain.java
index a5257b3..9c2e6a0 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/orders/domain/ZcOrderMain.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/orders/domain/ZcOrderMain.java
@@ -93,13 +93,13 @@ public class ZcOrderMain extends BaseEntity
     private Integer isAutoDeduct;
 
     /** 首次下单时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "首次下单时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "首次下单时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date firstOrderTime;
 
     /** 开始计费时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "开始计费时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "开始计费时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date startRentTime;
 
     /** 逾期天数 */
diff --git a/ruoyi-admin/src/main/resources/mapper/orders/ZcOrderMainMapper.xml b/ruoyi-admin/src/main/resources/mapper/orders/ZcOrderMainMapper.xml
index bb2c5e7..36e6d75 100644
--- a/ruoyi-admin/src/main/resources/mapper/orders/ZcOrderMainMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/orders/ZcOrderMainMapper.xml
@@ -91,6 +91,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="chargeTimes != null "> and a.charge_times = #{chargeTimes}</if>
             <if test="rentCarRuleId != null "> and a.rent_car_rule_id = #{rentCarRuleId}</if>
             <if test="rentBatteyRuleId != null "> and a.rent_battey_rule_id = #{rentBatteyRuleId}</if>
+
+            <if test="storeName != null and storeName!= '' "> and s.name = #{storeName}</if>
+            <if test="licensePlate != null and licensePlate!= '' "> and zc.license_plate = #{licensePlate}</if>
         </where>
     </select>
     
diff --git a/ruoyi-admin/src/main/resources/templates/operation/company/add.html b/ruoyi-admin/src/main/resources/templates/operation/company/add.html
index 02eb971..b4435f5 100644
--- a/ruoyi-admin/src/main/resources/templates/operation/company/add.html
+++ b/ruoyi-admin/src/main/resources/templates/operation/company/add.html
@@ -39,7 +39,10 @@
             <div class="form-group">
                 <label class="col-sm-3 control-label is-required">租车平台分成比例：</label>
                 <div class="col-sm-8">
-                    <input name="sharingRatio" class="form-control" type="text" required>
+                    <div class="input-group">
+                        <input name="sharingRatio" class="form-control" type="number" required>
+                        <span class="input-group-addon">%</span>
+                    </div>
                 </div>
             </div>
             <div class="form-group">
diff --git a/ruoyi-admin/src/main/resources/templates/operation/company/company.html b/ruoyi-admin/src/main/resources/templates/operation/company/company.html
index 64513e4..1e210e0 100644
--- a/ruoyi-admin/src/main/resources/templates/operation/company/company.html
+++ b/ruoyi-admin/src/main/resources/templates/operation/company/company.html
@@ -107,7 +107,10 @@
                 },
                 {
                     field: 'sharingRatio',
-                    title: '租车平台分成比例'
+                    title: '租车平台分成比例',
+                    formatter: function(value, row, index) {
+                        return value +"%";
+                    }
                 },
                 {
                     field: 'createBy',
@@ -130,12 +133,11 @@
                     align: 'center',
                     formatter: function(value, row, index) {
                         var actions = [];
-                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + ' btnOption" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
-                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + ' btnOption" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + ' btnOption" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>修改</a> ');
                         if (row.status == 1) {
-                            actions.push('<a class="btn btn-success btn-xs ' + editFlag + ' btnOption" href="javascript:void(0)" onclick="enable(\'' + row.id + '\',\'' + row.phone + '\')"><i class="fa fa-edit"></i>启用</a> ');
+                            actions.push('<a class="btn btn-success btn-xs ' + removeFlag + ' btnOption" href="javascript:void(0)" onclick="enable(\'' + row.id + '\',\'' + row.phone + '\')"><i class="fa fa-edit"></i>启用</a> ');
                         } else {
-                            actions.push('<a class="btn btn-success btn-xs ' + editFlag + ' btnOption" href="javascript:void(0)" onclick="disable(\'' + row.id + '\',\'' + row.phone + '\')"><i class="fa fa-edit"></i>停用</a> ');
+                            actions.push('<a class="btn btn-success btn-xs ' + removeFlag + ' btnOption" href="javascript:void(0)" onclick="disable(\'' + row.id + '\',\'' + row.phone + '\')"><i class="fa fa-edit"></i>停用</a> ');
                         }
                         return actions.join('');
                     }
diff --git a/ruoyi-admin/src/main/resources/templates/operation/company/edit.html b/ruoyi-admin/src/main/resources/templates/operation/company/edit.html
index de5de9f..06876f8 100644
--- a/ruoyi-admin/src/main/resources/templates/operation/company/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/operation/company/edit.html
@@ -40,7 +40,10 @@
             <div class="form-group">    
                 <label class="col-sm-3 control-label is-required">租车平台分成比例：</label>
                 <div class="col-sm-8">
-                    <input name="sharingRatio" th:field="*{sharingRatio}" class="form-control" type="text" required>
+                    <div class="input-group">
+                        <input name="sharingRatio"  th:field="*{sharingRatio}" class="form-control" type="number" required>
+                        <span class="input-group-addon">%</span>
+                    </div>
                 </div>
             </div>
             <div class="form-group">
diff --git a/ruoyi-admin/src/main/resources/templates/operation/store/add.html b/ruoyi-admin/src/main/resources/templates/operation/store/add.html
index 5d0716e..19e60c9 100644
--- a/ruoyi-admin/src/main/resources/templates/operation/store/add.html
+++ b/ruoyi-admin/src/main/resources/templates/operation/store/add.html
@@ -58,8 +58,8 @@
                 <label class="col-sm-3 control-label is-required">门店区域：</label>
                 <div class="col-sm-8">
                     <div class="input-group">
-                    <input id="areatreeId" name="cityId" type="hidden" th:value="${sysAreaHn?.areaCode}"/>
-                    <input class="form-control" type="text" onclick="selectAreaHnTree()" id="areatreeName" name="cityName" readonly="true" th:value="${sysAreaHn?.name}" required>
+                    <input id="areatreeId" name="areaId" type="hidden" th:value="${sysAreaHn?.areaCode}"/>
+                    <input class="form-control" type="text" onclick="selectAreaHnTree()" id="areatreeName" name="areaName" readonly="true" th:value="${sysAreaHn?.name}" required>
                     <span class="input-group-addon"><i class="fa fa-search"></i></span>
                     </div>
                 </div>
@@ -101,19 +101,28 @@
             <div class="form-group">
                 <label class="col-sm-3 control-label is-required">租车订单分成比例：</label>
                 <div class="col-sm-8">
-                    <input name="zucheRatio" class="form-control" type="text" required>
+                    <div class="input-group">
+                        <input name="zucheRatio" class="form-control" type="number" required>
+                        <span class="input-group-addon">%</span>
+                    </div>
                 </div>
             </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label is-required">租电订单分成比例：</label>
                 <div class="col-sm-8">
-                    <input name="zudianRatio" class="form-control" type="text" required>
+                    <div class="input-group">
+                        <input name="zudianRatio" class="form-control" type="number" required>
+                        <span class="input-group-addon">%</span>
+                    </div>
                 </div>
             </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label is-required">以租代售分成比例：</label>
                 <div class="col-sm-8">
-                    <input name="daishouRatio" class="form-control" type="text" required>
+                    <div class="input-group">
+                        <input name="daishouRatio" class="form-control" type="number" required>
+                        <span class="input-group-addon">%</span>
+                    </div>
                 </div>
             </div>
 
@@ -169,15 +178,15 @@
                     </div>
                 </div>
             </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label is-required">营业执照：</label>
-                <div class="col-sm-8">
-                    <input type="hidden" name="businessLicenseImg">
-                    <div class="file-loading">
-                        <input class="form-control file-upload" id="businessLicenseImg" name="file" type="file">
-                    </div>
-                </div>
-            </div>
+<!--            <div class="form-group">    -->
+<!--                <label class="col-sm-3 control-label is-required">营业执照：</label>-->
+<!--                <div class="col-sm-8">-->
+<!--                    <input type="hidden" name="businessLicenseImg">-->
+<!--                    <div class="file-loading">-->
+<!--                        <input class="form-control file-upload" id="businessLicenseImg" name="file" type="file">-->
+<!--                    </div>-->
+<!--                </div>-->
+<!--            </div>-->
             <div class="form-group">
                 <label class="col-sm-3 control-label is-required">门店修改信息：</label>
                 <div class="col-sm-8">
diff --git a/ruoyi-admin/src/main/resources/templates/operation/store/addStoreUser.html b/ruoyi-admin/src/main/resources/templates/operation/store/addStoreUser.html
index c7ed1a6..58d138c 100644
--- a/ruoyi-admin/src/main/resources/templates/operation/store/addStoreUser.html
+++ b/ruoyi-admin/src/main/resources/templates/operation/store/addStoreUser.html
@@ -57,6 +57,7 @@
         }
     }
 
+    var removeFlag = [[${@permission.hasPermi('baseUser:user:remove')}]];
 
     $(function() {
         var options = {
@@ -67,6 +68,8 @@
             showToggle: false,
             showColumns: false,
             sidePagination: "client",
+            removeUrl: prefix + "/remove",
+            modalName: "门店用户",
             columns: [{
                 checkbox: false
             },
@@ -102,7 +105,15 @@
                     align: 'center',
                     title: '创建时间'
                 },
-                ]
+                {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + ' btnOption" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
+                        return actions.join('');
+                    }
+                }]
         };
         $.table.init(options);
     });
diff --git a/ruoyi-admin/src/main/resources/templates/operation/store/edit.html b/ruoyi-admin/src/main/resources/templates/operation/store/edit.html
index eef9df3..1420e75 100644
--- a/ruoyi-admin/src/main/resources/templates/operation/store/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/operation/store/edit.html
@@ -59,8 +59,8 @@
             <label class="col-sm-3 control-label is-required">门店区域：</label>
             <div class="col-sm-8">
                 <div class="input-group">
-                    <input id="areatreeId" name="cityId" type="hidden" th:value="${sysAreaHn?.areaCode}" th:field="*{cityId}"/>
-                    <input class="form-control" type="text" onclick="selectAreaHnTree()" id="areatreeName" name="cityName"  th:field="*{cityName}"  readonly="true" th:value="${sysAreaHn?.name}" required>
+                    <input id="areatreeId" name="areaId" type="hidden" th:value="${sysAreaHn?.areaCode}" th:field="*{areaId}"/>
+                    <input class="form-control" type="text" onclick="selectAreaHnTree()" id="areatreeName" name="areaName"  th:field="*{areaName}"  readonly="true" th:value="${sysAreaHn?.name}" required>
                     <span class="input-group-addon"><i class="fa fa-search"></i></span>
                 </div>
             </div>
@@ -101,19 +101,28 @@
         <div class="form-group">
             <label class="col-sm-3 control-label is-required">租车订单分成比例：</label>
             <div class="col-sm-8">
-                <input name="zucheRatio" th:field="*{zucheRatio}" class="form-control" type="text" required>
+                <div class="input-group">
+                    <input name="zucheRatio" th:field="*{zucheRatio}" class="form-control" type="number" required>
+                    <span class="input-group-addon">%</span>
+                </div>
             </div>
         </div>
         <div class="form-group">
             <label class="col-sm-3 control-label is-required">租电订单分成比例：</label>
             <div class="col-sm-8">
-                <input name="zudianRatio" th:field="*{zudianRatio}" class="form-control" type="text" required>
+                <div class="input-group">
+                    <input name="zudianRatio" th:field="*{zudianRatio}" class="form-control" type="number" required>
+                    <span class="input-group-addon">%</span>
+                </div>
             </div>
         </div>
         <div class="form-group">
             <label class="col-sm-3 control-label is-required">以租代售分成比例：</label>
             <div class="col-sm-8">
-                <input name="daishouRatio" th:field="*{daishouRatio}" class="form-control" type="text" required>
+                <div class="input-group">
+                    <input name="daishouRatio" th:field="*{daishouRatio}" class="form-control" type="number" required>
+                    <span class="input-group-addon">%</span>
+                </div>
             </div>
         </div>
 
@@ -169,15 +178,15 @@
                 </div>
             </div>
         </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label is-required">营业执照：</label>
-            <div class="col-sm-8">
-                <input type="hidden" name="businessLicenseImg" th:value="*{businessLicenseImg}">
-                <div class="file-loading">
-                    <input class="form-control file-upload" id="businessLicenseImg" name="file" type="file">
-                </div>
-            </div>
-        </div>
+<!--        <div class="form-group">-->
+<!--            <label class="col-sm-3 control-label is-required">营业执照：</label>-->
+<!--            <div class="col-sm-8">-->
+<!--                <input type="hidden" name="businessLicenseImg" th:value="*{businessLicenseImg}">-->
+<!--                <div class="file-loading">-->
+<!--                    <input class="form-control file-upload" id="businessLicenseImg" name="file" type="file">-->
+<!--                </div>-->
+<!--            </div>-->
+<!--        </div>-->
         <div class="form-group">
             <label class="col-sm-3 control-label is-required">门店修改信息：</label>
             <div class="col-sm-8">
diff --git a/ruoyi-admin/src/main/resources/templates/operation/store/store.html b/ruoyi-admin/src/main/resources/templates/operation/store/store.html
index 04ed891..d275502 100644
--- a/ruoyi-admin/src/main/resources/templates/operation/store/store.html
+++ b/ruoyi-admin/src/main/resources/templates/operation/store/store.html
@@ -142,15 +142,24 @@
                 },
                 {
                     field: 'zucheRatio',
-                    title: '租车订单分成比例'
+                    title: '租车分成比例',
+                    formatter: function(value, row, index) {
+                        return value +"%";
+                    }
                 },
                 {
                     field: 'zudianRatio',
-                    title: '租电订单分成比例'
+                    title: '租电分成比例',
+                    formatter: function(value, row, index) {
+                        return value +"%";
+                    }
                 },
                 {
                     field: 'daishouRatio',
-                    title: '以租代售分成比例'
+                    title: '以租代售分成比例',
+                    formatter: function(value, row, index) {
+                        return value +"%";
+                    }
                 },
                 {
                     field: 'label',
@@ -183,7 +192,7 @@
                     formatter: function(value, row, index) {
                         var actions = [];
                         actions.push('<a class="btn btn-success btn-xs ' + editFlag + ' btnOption" href="javascript:void(0)" onclick="assStoreUser(\'' + row.id + '\')"><i class="fa fa-edit"></i>门店用户</a> ');
-                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + ' btnOption" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + ' btnOption" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>修改</a> ');
                         actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + ' btnOption" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
                         if (row.status == 1) {
                             actions.push('<a class="btn btn-success btn-xs ' + editFlag + ' btnOption" href="javascript:void(0)" onclick="enable(\'' + row.id + '\')"><i class="fa fa-edit"></i>启用</a> ');
diff --git a/ruoyi-admin/src/main/resources/templates/orders/order/edit.html b/ruoyi-admin/src/main/resources/templates/orders/order/edit.html
index 7d0de82..5a52159 100644
--- a/ruoyi-admin/src/main/resources/templates/orders/order/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/orders/order/edit.html
@@ -10,130 +10,105 @@
             <h4 class="form-header h4">租车订单信息</h4>
             <input name="orderId" th:field="*{orderId}" type="hidden">
             <div class="form-group">    
-                <label class="col-sm-3 control-label is-required">订单编号：</label>
-                <div class="col-sm-8">
-                    <input name="orderNo" th:field="*{orderNo}" class="form-control" type="text" required>
+                <label class="col-sm-2 control-label is-required">订单编号：</label>
+                <div class="col-sm-4">
+                    <div class="form-control-static" th:text="*{orderNo}"></div>
                 </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label is-required">订单状态:</label>
-                <div class="col-sm-8">
-                    <select name="orderStatus" class="form-control m-b" th:with="type=${@dict.getType('key_order_status')}" required>
-                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{rentalType}"></option>
-                    </select>
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label is-required">所属运营商：</label>
-                <div class="col-sm-8">
-                    <input name="operatorName" th:field="*{operatorName}" class="form-control" type="text" required>
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label is-required">所属门店：</label>
-                <div class="col-sm-8">
-                    <input name="storeName" th:field="*{storeName}" class="form-control" type="text" required>
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label is-required">车辆：</label>
-                <div class="col-sm-8">
-                    <input name="vehicleId" th:field="*{vehicleId}" class="form-control" type="text" required>
+                <label class="col-sm-2 control-label is-required">订单状态:</label>
+                <div class="col-sm-4">
+                    <div class="form-control-static" th:text="${@dict.getLabel('key_order_status', zcOrderMain.orderStatus)}"></div>
                 </div>
             </div>
             <div class="form-group">
-                <label class="col-sm-3 control-label is-required">客户姓名：</label>
-                <div class="col-sm-8">
-                    <input name="customerName" th:field="*{customerName}" class="form-control" type="text" required>
+                <label class="col-sm-2 control-label is-required">所属运营商：</label>
+                <div class="col-sm-4">
+                    <div class="form-control-static" th:text="*{operatorName}"></div>
+                </div>
+                <label class="col-sm-2 control-label is-required">所属门店:</label>
+                <div class="col-sm-4">
+                    <div class="form-control-static" th:text="*{storeName}"></div>
                 </div>
             </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label is-required">客户联系电话：</label>
-                <div class="col-sm-8">
-                    <input name="customerPhone" th:field="*{customerPhone}" class="form-control" type="text" required>
+            <div class="form-group">
+                <label class="col-sm-2 control-label is-required">车辆：</label>
+                <div class="col-sm-4">
+                    <div class="form-control-static" th:text="*{vehicleId}"></div>
+                </div>
+                <label class="col-sm-2 control-label is-required">客户姓名:</label>
+                <div class="col-sm-4">
+                    <div class="form-control-static" th:text="*{customerName}"></div>
                 </div>
             </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label is-required">租赁类型：</label>
-                <div class="col-sm-8">
-                    <select name="rentalType" class="form-control m-b" th:with="type=${@dict.getType('key_order_rental_type')}" required>
-                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{rentalType}"></option>
-                    </select>
+            <div class="form-group">
+                <label class="col-sm-2 control-label is-required">客户联系电话：</label>
+                <div class="col-sm-4">
+                    <div class="form-control-static" th:text="*{customerPhone}"></div>
+                </div>
+                <label class="col-sm-2 control-label is-required">租赁类型:</label>
+                <div class="col-sm-4">
+                    <div class="form-control-static" th:text="${@dict.getLabel('key_order_rental_type', zcOrderMain.rentalType)}"></div>
                 </div>
             </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">租赁天数：</label>
-                <div class="col-sm-8">
-                    <input name="rentalDays" th:field="*{rentalDays}" class="form-control" type="text">
+            <div class="form-group">
+                <label class="col-sm-2 control-label is-required">租赁天数：</label>
+                <div class="col-sm-4">
+                    <div class="form-control-static" th:text="*{rentalDays}"></div>
+                </div>
+                <label class="col-sm-2 control-label is-required">租车价格(元):</label>
+                <div class="col-sm-4">
+                    <div class="form-control-static" th:text="*{rentalPrice}"></div>
                 </div>
             </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label is-required">租车价格(元)：</label>
-                <div class="col-sm-8">
-                    <input name="rentalPrice" th:field="*{rentalPrice}" class="form-control" type="text" required>
+            <div class="form-group">
+                <label class="col-sm-2 control-label is-required">押金价格(元)：</label>
+                <div class="col-sm-4">
+                    <div class="form-control-static" th:text="*{depositPrice}"></div>
+                </div>
+                <label class="col-sm-2 control-label is-required">逾期金额(元):</label>
+                <div class="col-sm-4">
+                    <div class="form-control-static" th:text="*{overdueFee}"></div>
                 </div>
             </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label is-required">押金价格(元)：</label>
-                <div class="col-sm-8">
-                    <input name="depositPrice" th:field="*{depositPrice}" class="form-control" type="text" required>
+            <div class="form-group">
+                <label class="col-sm-2 control-label is-required">是否开通免押：</label>
+                <div class="col-sm-4">
+                    <div class="form-control-static" th:text="*{isDepositFree}"></div>
+                </div>
+                <label class="col-sm-2 control-label is-required">是否开通代扣:</label>
+                <div class="col-sm-4">
+                    <div class="form-control-static" th:text="*{isAutoDeduct}"></div>
                 </div>
             </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label is-required">逾期金额(元)：</label>
-                <div class="col-sm-8">
-                    <input name="overdueFee" th:field="*{overdueFee}" class="form-control" type="text" required>
+            <div class="form-group">
+                <label class="col-sm-2 control-label is-required">首次下单时间：</label>
+                <div class="col-sm-4">
+                    <div class="form-control-static" th:text="${#dates.format(zcOrderMain.firstOrderTime, 'yyyy-MM-dd HH:mm:ss')}"></div>
+                </div>
+                <label class="col-sm-2 control-label is-required">开始计费时间:</label>
+                <div class="col-sm-4">
+                    <div class="form-control-static" th:text="${#dates.format(zcOrderMain.startRentTime, 'yyyy-MM-dd HH:mm:ss')}"></div>
                 </div>
             </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label is-required">是否开通免押：</label>
-                <div class="col-sm-8">
-                    <input name="isDepositFree" th:field="*{isDepositFree}" class="form-control" type="text" required>
+            <div class="form-group">
+                <label class="col-sm-2 control-label is-required">逾期天数：</label>
+                <div class="col-sm-4">
+                    <div class="form-control-static" th:text="*{overdueDays}"></div>
+                </div>
+                <label class="col-sm-2 control-label is-required">续租次数:</label>
+                <div class="col-sm-4">
+                    <div class="form-control-static" th:text="*{renewalTimes}"></div>
                 </div>
             </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label is-required">是否开通代扣：</label>
-                <div class="col-sm-8">
-                    <input name="isAutoDeduct" th:field="*{isAutoDeduct}" class="form-control" type="text" required>
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label is-required">首次下单时间：</label>
-                <div class="col-sm-8">
-                    <div class="input-group date">
-                        <input name="firstOrderTime" th:value="${#dates.format(zcOrderMain.firstOrderTime, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text" required>
-                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-                    </div>
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label is-required">开始计费时间：</label>
-                <div class="col-sm-8">
-                    <div class="input-group date">
-                        <input name="startRentTime" th:value="${#dates.format(zcOrderMain.startRentTime, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text" required>
-                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-                    </div>
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label is-required">逾期天数：</label>
-                <div class="col-sm-8">
-                    <input name="overdueDays" th:field="*{overdueDays}" class="form-control" type="text" required>
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label is-required">续租次数：</label>
-                <div class="col-sm-8">
-                    <input name="renewalTimes" th:field="*{renewalTimes}" class="form-control" type="text" required>
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label is-required">充电次数：</label>
-                <div class="col-sm-8">
-                    <input name="chargeTimes" th:field="*{chargeTimes}" class="form-control" type="text" required>
+            <div class="form-group">
+                <label class="col-sm-2 control-label is-required">充电次数：</label>
+                <div class="col-sm-4">
+                    <div class="form-control-static" th:text="*{chargeTimes}"></div>
                 </div>
+
             </div>
 
+
+
             <h4 class="form-header h4">租车子订单信息</h4>
             <div class="row">
                 <div class="col-sm-12">
@@ -182,9 +157,7 @@
                 showToggle: false,
                 showColumns: false,
                 sidePagination: "client",
-                columns: [{
-                    checkbox: true
-                },
+                columns: [
                 {
                     field: 'index',
                     align: 'center',
diff --git a/ruoyi-admin/src/main/resources/templates/orders/order/order.html b/ruoyi-admin/src/main/resources/templates/orders/order/order.html
index c0dad3b..67780ea 100644
--- a/ruoyi-admin/src/main/resources/templates/orders/order/order.html
+++ b/ruoyi-admin/src/main/resources/templates/orders/order/order.html
@@ -19,11 +19,11 @@
                             </li>
                             <li>
                                 <label>所属门店：</label>
-                                <input type="text" name="storeId"/>
+                                <input type="text" name="storeName"/>
                             </li>
                             <li>
                                 <label>车辆：</label>
-                                <input type="text" name="vehicleId"/>
+                                <input type="text" name="licensePlate"/>
                             </li>
                             <li>
                                 <label>订单编号：</label>
@@ -106,7 +106,12 @@
                 },
                 {
                     field: 'orderNo',
-                    title: '订单编号'
+                    title: '订单编号',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-success btn-xs btnOption" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.orderId + '\',1300,800)">' + value + '</a> ');
+                        return actions.join('');
+                    }
                 },
                 {
                     field: 'orderStatus',
@@ -133,7 +138,7 @@
                 },
                 {
                     field: 'customerPhone',
-                    title: '客户联系电话'
+                    title: '联系电话'
                 },
                 {
                     field: 'rentalType',
@@ -182,7 +187,7 @@
                     align: 'center',
                     formatter: function(value, row, index) {
                         var actions = [];
-                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + ' btnOption" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.orderId + '\',1300,700)"><i class="fa fa-edit"></i>查看</a> ');
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + ' btnOption" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.orderId + '\',1300,800)"><i class="fa fa-edit"></i>查看</a> ');
                         //actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.orderId + '\')"><i class="fa fa-remove"></i>删除</a>');
                         return actions.join('');
                     }