feat:分公司新增权限配置

“mitao”

2026-01-07 b6b116dfb83bf5097e001e8a564f639a98f911e2

feat:分公司新增权限配置

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCompanyController.java

@@ -93,6 +93,10 @@
        //经营区域
        List<Map<String, Object>> scopeList = tCompanyService.getCompanyScopeById(tCompany.getId());
        model.addAttribute("scopeList",scopeList);

        //传递当前用户角色类型，用于控制非平台账号禁用经营业务和经营区域编辑
        model.addAttribute("roleType", user1.getRoleType());

        return PREFIX + "platformEdit.html";
    }

@@ -184,6 +188,9 @@
        //经营区域
        List<Map<String, Object>> scopeList = tCompanyService.getCompanyScopeById(tCompanyId);
        model.addAttribute("scopeList",scopeList);

        // 传递当前用户角色类型，用于控制非平台账号禁用经营业务和经营区域编辑
        model.addAttribute("roleType", shiroExtUtil.getUser().getRoleType());
        return PREFIX + "tCompany_edit.html";
    }


 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java

@@ -2439,6 +2439,7 @@
        shellList.add("所属分公司");
        shellList.add("所属加盟商");
        shellList.add("当前车辆");
        shellList.add("当前绑定车辆");
        shellList.add("服务模式");
        shellList.add("关联线路");
        shellList.add("评分");
@@ -2494,6 +2495,11 @@
            }else{
                shellList.add("-");
            }
            if(SinataUtil.isNotEmpty(object.get("carName"))){
                shellList.add(object.get("carName").toString());
            }else{
                shellList.add("-");
            }
            if(SinataUtil.isNotEmpty(object.get("serverStr"))){
                shellList.add(object.get("serverStr").toString());
            }else{

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderCrossCityController.java

@@ -208,7 +208,7 @@
            shellList.add("系统订单编号");
            shellList.add("订单中心编号");
            shellList.add("订单来源");
            shellList.add("乘车时间");
            shellList.add("班次时间");
            shellList.add("下单用户昵称");
            shellList.add("下单用户手机");
            shellList.add("乘车用户姓名");

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/MenuController.java

@@ -34,6 +34,7 @@
import javax.annotation.Resource;
import javax.validation.Valid;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@@ -49,6 +50,27 @@
public class MenuController extends BaseController {

    private static String PREFIX = "/system/menu/";

    // 快车相关菜单（isSpe=2时过滤）
    private static final List<String> SPE_MENUS = Arrays.asList(
        "快车订单", "快车改派管理", "快车车型设置"
    );

    // 出租车相关菜单（isTaxi=2时过滤）
    private static final List<String> TAXI_MENUS = Arrays.asList(
        "出租车订单", "出租车改派管理"
    );

    // 跨城相关菜单（isCross=2时过滤）
    private static final List<String> CROSS_MENUS = Arrays.asList(
        "跨城出行订单", "跨城改派管理", "跨城线路管理", "开通城市管理"
    );

    // 顺风车相关菜单（isHitchRide=2时过滤）
    private static final List<String> HITCH_RIDE_MENUS = Arrays.asList(
        "顺风车订单", "顺风车设置", "顺风车司机审核列表",
        "顺风车司机", "顺风车投诉", "顺风车评价"
    );

    @Autowired
    private IMenuService menuService;
@@ -216,6 +238,10 @@
            }
        }
        List<ZTreeNode> roleTreeList = this.menuService.menuTreeList(ids);
        // 分公司(type=2)和供应商(type=3)需要根据经营范围过滤菜单
        if (tCompany.getType() == 2 || tCompany.getType() == 3) {
            roleTreeList = filterMenusByBusinessScope(roleTreeList, tCompany);
        }
        return roleTreeList;
    }

@@ -237,6 +263,10 @@
            }
        }
        List<ZTreeNode> roleTreeList = this.menuService.menuTreeList(ids);
        // 分公司(type=2)和供应商(type=3)需要根据经营范围过滤菜单
        if (tCompany.getType() == 2 || tCompany.getType() == 3) {
            roleTreeList = filterMenusByBusinessScope(roleTreeList, tCompany);
        }
        roleTreeList.add(ZTreeNode.createParent());
        return roleTreeList;
    }
@@ -261,9 +291,17 @@
        }
        if (ToolUtil.isEmpty(menuIds)) {
            List<ZTreeNode> roleTreeList = this.menuService.menuTreeList(ids);
            // 分公司(type=2)和供应商(type=3)需要根据经营范围过滤菜单
            if (tCompany.getType() == 2 || tCompany.getType() == 3) {
                roleTreeList = filterMenusByBusinessScope(roleTreeList, tCompany);
            }
            return roleTreeList;
        } else {
            List<ZTreeNode> roleTreeListByUserId = this.menuService.menuTreeListByMenuIds(menuIds, ids);
            // 分公司(type=2)和供应商(type=3)需要根据经营范围过滤菜单
            if (tCompany.getType() == 2 || tCompany.getType() == 3) {
                roleTreeListByUserId = filterMenusByBusinessScope(roleTreeListByUserId, tCompany);
            }
            return roleTreeListByUserId;
        }
    }
@@ -292,4 +330,39 @@
        }
    }

    /**
     * 根据企业经营范围过滤菜单
     * @param menuList 原始菜单列表
     * @param company 企业信息
     * @return 过滤后的菜单列表
     */
    private List<ZTreeNode> filterMenusByBusinessScope(List<ZTreeNode> menuList, TCompany company) {
        List<String> excludeMenuNames = new ArrayList<>();

        // isSpe=2 不经营快车
        if (company.getIsSpe() != null && company.getIsSpe() == 2) {
            excludeMenuNames.addAll(SPE_MENUS);
        }
        // isTaxi=2 不经营出租车
        if (company.getIsTaxi() != null && company.getIsTaxi() == 2) {
            excludeMenuNames.addAll(TAXI_MENUS);
        }
        // isCross=2 不经营跨城
        if (company.getIsCross() != null && company.getIsCross() == 2) {
            excludeMenuNames.addAll(CROSS_MENUS);
        }
        // isHitchRide=2 不经营顺风车
        if (company.getIsHitchRide() != null && company.getIsHitchRide() == 2) {
            excludeMenuNames.addAll(HITCH_RIDE_MENUS);
        }

        if (excludeMenuNames.isEmpty()) {
            return menuList;
        }

        return menuList.stream()
            .filter(node -> !excludeMenuNames.contains(node.getName()))
            .collect(Collectors.toList());
    }

}

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TDriverMapper.xml

@@ -137,13 +137,15 @@

    <!--根据审核通过的司机列表-->
    <select id="getDriverList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
        SELECT * FROM (SELECT cc1.`name` as companyName,cc2.`name` as franchiseeName,if(dw.driverId is null, '', ci.carLicensePlate) as carLicensePlate,ds.serverStr,IFNULL(oe.evaluateNum,0) as evaluateNum,
        SELECT * FROM (SELECT cc1.`name` as companyName,cc2.`name` as franchiseeName,if(dw.driverId is null, '', ci.carLicensePlate) as carLicensePlate,if(dw.driverId is null, '', CONCAT(IFNULL(cb.name,''), IFNULL(cm.name,''))) as carName,ds.serverStr,IFNULL(oe.evaluateNum,0) as evaluateNum,
        (IFNULL(ot1.taxiNum, 0) + IFNULL(ot3.num, 0) + IFNULL(ot5.num, 0) + IFNULL(ot7.num, 0)) as historyNum,
        (IFNULL(ot2.taxiMoney, 0)+ IFNULL(ot4.money, 0) + IFNULL(ot6.money, 0) + IFNULL(ot8.money, 0)) as historyMoney,
        dd.* from t_driver as dd
        LEFT JOIN (select * from t_company where type = 2 and flag != 3) as cc1 on cc1.id = dd.companyId
        LEFT JOIN (select * from t_company where type = 3 and flag != 3) as cc2 on cc2.id = dd.franchiseeId
        LEFT JOIN (select * from t_car where state = 1) as ci on ci.id = dd.carId
        LEFT JOIN (select * from t_car_brand where state = 1) as cb on cb.id = ci.carBrandId
        LEFT JOIN (select * from t_car_model where state = 1) as cm on cm.id = ci.carModelId
        LEFT JOIN (select * from t_driver_work where state = 1) as dw on dd.id = dw.driverId
        LEFT JOIN (
        SELECT

 ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/platformEdit.html

@@ -65,35 +65,39 @@
                            <fieldset>
                                <div class="checkbox checkbox-success">
                                    <input name="checkbox" id="checkbox1" type="checkbox" value="1" ${1== item.isSpe ?
                                    'checked=checked' : ''} onclick="TCompanyInfoDlg.checkbox1()">
                                    <label for="checkbox1">
                                    'checked=checked' : ''} onclick="TCompanyInfoDlg.checkbox1()" ${roleType != 1 ? 'disabled' : ''}>
                                    <label for="checkbox1" ${roleType != 1 ? 'style="color:#999"' : ''}>
                                        快车
                                    </label>
                                    <fieldset>
                                        @if(roleType == 1){
                                        <#button btnCss="info" name="设置司机抽成" id="Spe1" icon="fa-check"
                                        clickFun="TLineInfoDlg.set1('Spe')"/>
                                        @}
                                        <textarea id="Spe" rows="5" cols="50" hidden="hidden" value="${item.Spe}">${item.Spe}</textarea>
									

                                    </fieldset>
                                </div>
                                <div class="checkbox checkbox-primary">
                                    <input name="checkbox" id="checkbox2" type="checkbox" value="2" ${1== item.isTaxi ?
                                    'checked=checked' : ''} onclick="TCompanyInfoDlg.checkbox2()">
                                    <label for="checkbox2">
                                    'checked=checked' : ''} onclick="TCompanyInfoDlg.checkbox2()" ${roleType != 1 ? 'disabled' : ''}>
                                    <label for="checkbox2" ${roleType != 1 ? 'style="color:#999"' : ''}>
                                        出租车
                                    </label>
                                    <fieldset>
                                        <div class="row" style="display: none;" id="czDiv">
                                            @if(roleType == 1){
                                            <#button btnCss="info" name="设置司机抽成" id="rakeRate" icon="fa-check"
                                            clickFun="TLineInfoDlg.set1('Taxi')"/>
                                            @}
                                            <textarea id="Taxi" rows="5" cols="50" hidden="hidden" value="${item.Taxi}">${item.Taxi}</textarea>
                                        </div>
                                    </fieldset>
                                </div>
                                <div class="checkbox checkbox-success">
                                    <input name="checkbox" id="checkbox3" type="checkbox" value="3" ${1== item.isCross ?
                                    'checked=checked' : ''} onclick="TCompanyInfoDlg.checkbox3()">
                                    <label for="checkbox3">
                                    'checked=checked' : ''} onclick="TCompanyInfoDlg.checkbox3()" ${roleType != 1 ? 'disabled' : ''}>
                                    <label for="checkbox3" ${roleType != 1 ? 'style="color:#999"' : ''}>
                                        跨城出行
                                    </label>
                                </div>
@@ -141,15 +145,15 @@
                                <!--                                </div>-->
                                <div class="checkbox checkbox-success">
                                    <input id="checkbox8" name="checkbox" onclick="TCompanyInfoDlg.checkbox8()"
                                           type="checkbox" value="8"  ${1 == item.isHitchRide ? 'checked=checked' : ''} >
                                    <label for="checkbox8">
                                           type="checkbox" value="8"  ${1 == item.isHitchRide ? 'checked=checked' : ''} ${roleType != 1 ? 'disabled' : ''}>
                                    <label for="checkbox8" ${roleType != 1 ? 'style="color:#999"' : ''}>
                                        顺风车
                                    </label>
                                </div>
                                <div class="checkbox checkbox-success">
                                    <input id="checkbox9" name="checkbox" onclick="TCompanyInfoDlg.checkbox9()"
                                           type="checkbox" value="9" ${1 == item.isSubstituteDriving ? 'checked=checked' : ''} >
                                    <label for="checkbox9">
                                           type="checkbox" value="9" ${1 == item.isSubstituteDriving ? 'checked=checked' : ''} ${roleType != 1 ? 'disabled' : ''}>
                                    <label for="checkbox9" ${roleType != 1 ? 'style="color:#999"' : ''}>
                                        代驾
                                    </label>
                                </div>
@@ -164,7 +168,7 @@
                    <div class="form-group">
                        <label class="col-sm-2 control-label">经营区域：</label>
                        <div class="col-sm-2">
                            <select class="form-control" id="province" onchange="TCompanyInfoDlg.provinceChange(this)">
                            <select class="form-control" id="province" onchange="TCompanyInfoDlg.provinceChange(this)" ${roleType != 1 ? 'disabled' : ''}>
                                <option value="">选择省</option>
                                @for(obj in provinceList){
                                <option value="${obj.code}">${obj.name}</option>
@@ -172,18 +176,20 @@
                            </select>
                        </div>
                        <div class="col-sm-2">
                            <select class="form-control" id="city" onchange="TCompanyInfoDlg.cityChage(this)">
                            <select class="form-control" id="city" onchange="TCompanyInfoDlg.cityChage(this)" ${roleType != 1 ? 'disabled' : ''}>
                                <option value="">选择市</option>
                            </select>
                        </div>
                        <div class="col-sm-2">
                            <select class="form-control" id="area">
                            <select class="form-control" id="area" ${roleType != 1 ? 'disabled' : ''}>
                                <option value="">选择区</option>
                            </select>
                        </div>
                        <div class="col-sm-1">
                            @if(roleType == 1){
                            <#button btnCss="info" name="添加" id="ensure" icon="fa-check"
                            clickFun="TCompanyInfoDlg.addScope()"/>
                            @}
                        </div>
                    </div>
                    <div class="form-group">
@@ -207,7 +213,9 @@
                                            <input type="hidden" id="areaCode" name="areaCode" value="${obj.areaCode}">${obj.value}
                                        </td>
                                        <td>
                                            @if(roleType == 1){
                                            <button onclick="deleteSub(this)">移除</button>
                                            @}
                                        </td>
                                    </tr>
                                    @}

 ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_addFranchisee.html

@@ -29,6 +29,7 @@
                        <label class="col-sm-3 control-label">经营业务：</label>
                        <div class="col-sm-9">
                            <fieldset>
                                @if(roleType == 1 || (roleType == 2 && company.isSpe == 1)){
                                <div class="checkbox checkbox-success">
                                    <input name="checkbox" id="checkbox1" type="checkbox" value="1" onclick="FranchiseeInfoDlg.checkbox1()">
                                    <label for="checkbox1">
@@ -41,6 +42,8 @@
                                        </div>
                                    </fieldset>
                                </div>
                                @}
                                @if(roleType == 1 || (roleType == 2 && company.isTaxi == 1)){
                                <div class="checkbox checkbox-primary">
                                    <input name="checkbox" id="checkbox2" type="checkbox" value="2" onclick="FranchiseeInfoDlg.checkbox2()">
                                    <label for="checkbox2">
@@ -53,12 +56,15 @@
                                        </div>
                                    </fieldset>
                                </div>
                                @}
                                @if(roleType == 1 || (roleType == 2 && company.isCross == 1)){
                                <div class="checkbox checkbox-success">
                                    <input name="checkbox" id="checkbox3" type="checkbox" value="3" onclick="FranchiseeInfoDlg.checkbox3()">
                                    <label for="checkbox3">
                                        跨城出行
                                    </label>
                                </div>
                                @}
<!--                                <div class="checkbox checkbox-info">-->
<!--                                    <input name="checkbox" id="checkbox4" type="checkbox" value="4" onclick="FranchiseeInfoDlg.checkbox4()">-->
<!--                                    <label for="checkbox4">-->
@@ -101,6 +107,7 @@
<!--                                        </div>-->
<!--                                    </fieldset>-->
<!--                                </div>-->
                                @if(roleType == 1 || (roleType == 2 && company.isHitchRide == 1)){
                                <div class="checkbox checkbox-success">
                                    <input id="checkbox8" name="checkbox" onclick="TCompanyInfoDlg.checkbox8()"
                                           type="checkbox" value="8">
@@ -108,6 +115,8 @@
                                        顺风车
                                    </label>
                                </div>
                                @}
                                @if(roleType == 1 || (roleType == 2 && company.isSubstituteDriving == 1)){
                                <div class="checkbox checkbox-success">
                                    <input id="checkbox9" name="checkbox" onclick="TCompanyInfoDlg.checkbox9()"
                                           type="checkbox" value="9">
@@ -115,6 +124,7 @@
                                        代驾
                                    </label>
                                </div>
                                @}
                            </fieldset>
                        </div>
                    </div>

 ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_edit.html

@@ -52,8 +52,8 @@
                            <fieldset>
                                <div class="checkbox checkbox-success">
                                    <input name="checkbox" id="checkbox1" type="checkbox" value="1" ${1== item.isSpe ?
                                    'checked=checked' : ''} onclick="TCompanyInfoDlg.checkbox1()">
                                    <label for="checkbox1">
                                    'checked=checked' : ''} onclick="TCompanyInfoDlg.checkbox1()" ${roleType != 1 ? 'disabled' : ''}>
                                    <label for="checkbox1" ${roleType != 1 ? 'style="color:#999"' : ''}>
                                        快车
                                    </label>
                                    <fieldset>
@@ -67,8 +67,8 @@
                                </div>
                                <div class="checkbox checkbox-primary">
                                    <input name="checkbox" id="checkbox2" type="checkbox" value="2" ${1== item.isTaxi ?
                                    'checked=checked' : ''} onclick="TCompanyInfoDlg.checkbox2()">
                                    <label for="checkbox2">
                                    'checked=checked' : ''} onclick="TCompanyInfoDlg.checkbox2()" ${roleType != 1 ? 'disabled' : ''}>
                                    <label for="checkbox2" ${roleType != 1 ? 'style="color:#999"' : ''}>
                                        出租车
                                    </label>
                                    <fieldset>
@@ -81,8 +81,8 @@
                                </div>
                                <div class="checkbox checkbox-success">
                                    <input name="checkbox" id="checkbox3" type="checkbox" value="3" ${1== item.isCross ?
                                    'checked=checked' : ''} onclick="TCompanyInfoDlg.checkbox3()">
                                    <label for="checkbox3">
                                    'checked=checked' : ''} onclick="TCompanyInfoDlg.checkbox3()" ${roleType != 1 ? 'disabled' : ''}>
                                    <label for="checkbox3" ${roleType != 1 ? 'style="color:#999"' : ''}>
                                        跨城出行
                                    </label>
                                </div>
@@ -128,15 +128,15 @@
                                <!--                                        </div>-->
                                <div class="checkbox checkbox-success">
                                    <input id="checkbox8" name="checkbox" onclick="TCompanyInfoDlg.checkbox8()"
                                           type="checkbox" value="8"  ${1 == item.isHitchRide ? 'checked=checked' : ''} >
                                    <label for="checkbox8">
                                           type="checkbox" value="8"  ${1 == item.isHitchRide ? 'checked=checked' : ''} ${roleType != 1 ? 'disabled' : ''}>
                                    <label for="checkbox8" ${roleType != 1 ? 'style="color:#999"' : ''}>
                                        顺风车
                                    </label>
                                </div>
                                <div class="checkbox checkbox-success">
                                    <input id="checkbox9" name="checkbox" onclick="TCompanyInfoDlg.checkbox9()"
                                           type="checkbox" value="9" ${1 == item.isSubstituteDriving ? 'checked=checked' : ''} >
                                    <label for="checkbox9">
                                           type="checkbox" value="9" ${1 == item.isSubstituteDriving ? 'checked=checked' : ''} ${roleType != 1 ? 'disabled' : ''}>
                                    <label for="checkbox9" ${roleType != 1 ? 'style="color:#999"' : ''}>
                                        代驾
                                    </label>
                                </div>

 ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_updateFranchisee.html

@@ -29,6 +29,7 @@
                        <label class="col-sm-3 control-label">经营业务：</label>
                        <div class="col-sm-9">
                            <fieldset>
                                @if(roleType == 1 || (roleType == 2 && company.isSpe == 1)){
                                <div class="checkbox checkbox-success">
                                    <input name="checkbox" id="checkbox1" type="checkbox" value="1" ${1== item.isSpe ? 'checked=checked' : ''} onclick="FranchiseeInfoDlg.checkbox1()">
                                    <label for="checkbox1">
@@ -41,6 +42,8 @@
                                        </div>
                                    </fieldset>
                                </div>
                                @}
                                @if(roleType == 1 || (roleType == 2 && company.isTaxi == 1)){
                                <div class="checkbox checkbox-primary">
                                    <input name="checkbox" id="checkbox2" type="checkbox" value="2" ${1== item.isTaxi ? 'checked=checked' : ''} onclick="FranchiseeInfoDlg.checkbox2()">
                                    <label for="checkbox2">
@@ -54,12 +57,15 @@
                                        </div>
                                    </fieldset>
                                </div>
                                @}
                                @if(roleType == 1 || (roleType == 2 && company.isCross == 1)){
                                <div class="checkbox checkbox-success">
                                    <input name="checkbox" id="checkbox3" type="checkbox" value="3" ${1== item.isCross ? 'checked=checked' : ''} onclick="FranchiseeInfoDlg.checkbox3()">
                                    <label for="checkbox3">
                                        跨城出行
                                    </label>
                                </div>
                                @}
                                <!--                                <div class="checkbox checkbox-info">-->
                                <!--                                    <input name="checkbox" id="checkbox4" type="checkbox" value="4" ${1 == item.isSameLogistics ? 'checked=checked' : ''} onclick="FranchiseeInfoDlg.checkbox4()">-->
                                <!--                                    <label for="checkbox4">-->
@@ -102,20 +108,24 @@
                                <!--                                        </div>-->
                                <!--                                    </fieldset>-->
                                <!--                                </div>-->
                                @if(roleType == 1 || (roleType == 2 && company.isHitchRide == 1)){
                                <div class="checkbox checkbox-success">
                                    <input id="checkbox8" name="checkbox" onclick="TCompanyInfoDlg.checkbox8()"
                                           type="checkbox" value="8"  ${1 == item.isHitchRide ? 'checked=checked' : ''} >
                                           type="checkbox" value="8"  ${1 == item.isHitchRide ? 'checked=checked' : ''}>
                                    <label for="checkbox8">
                                        顺风车
                                    </label>
                                </div>
                                @}
                                @if(roleType == 1 || (roleType == 2 && company.isSubstituteDriving == 1)){
                                <div class="checkbox checkbox-success">
                                    <input id="checkbox9" name="checkbox" onclick="TCompanyInfoDlg.checkbox9()"
                                           type="checkbox" value="9" ${1 == item.isSubstituteDriving ? 'checked=checked' : ''} >
                                           type="checkbox" value="9" ${1 == item.isSubstituteDriving ? 'checked=checked' : ''}>
                                    <label for="checkbox9">
                                        代驾
                                    </label>
                                </div>
                                @}
                            </fieldset>
                        </div>
                    </div>

 ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCrossCity/tOrderCrossCity_detail.html

@@ -39,7 +39,7 @@

                <div class="col-sm-6">
                    <#label id="orderNum" name="订单编号" value="${item.orderNum}"/>
                    <#label id="travelTimeStr" name="乘车时间" value="${item.travelTimeStr}"/>
                    <#label id="travelTimeStr" name="班次时间" value="${item.travelTimeStr}"/>
                    <#label id="userPhone" name="下单用户手机号" value="${item.userPhone}"/>
                    <#label id="passengersPhone" name="乘车用户手机号" value="${item.passengersPhone}"/>
                    <#label id="endAddress" name="终点" value="${item.endAddress}"/>

 ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tDriver/yesDriver.js

@@ -117,6 +117,17 @@
                return btn;
            }
        },
        {title: '当前绑定车辆', field: 'carName', visible: true, align: 'center', valign: 'middle',width:'7%',
            formatter: function (value, row) {
                var btn = "";
                if(row.carName != '' && row.carName != null) {
                    btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.carName + '" onfocus="TUser.tooltip()">' + row.carName + '</p>']
                }else{
                    btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="-" onfocus="TUser.tooltip()">-</p>']
                }
                return btn;
            }
        },
        {title: '服务模式', field: 'serverStr', visible: true, align: 'center', valign: 'middle',width:'7%',
            formatter: function (value, row) {
                var btn = "";

 ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tOrderCrossCity/tOrderCrossCity.js

@@ -64,7 +64,7 @@
        },
        {title: '所属公司', field: 'companyName', visible: true, align: 'center', valign: 'middle',
        },
        {title: '乘车时间', field: 'travelTime', visible: true, align: 'center', valign: 'middle',width:'10%',
        {title: '班次时间', field: 'travelTime', visible: true, align: 'center', valign: 'middle',width:'10%',
            formatter: function (value, row) {
                var btn = "";
                if(row.travelTime != '' && row.travelTime != null) {