ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCarController.java
@@ -134,6 +134,32 @@ model.addAttribute("zcModelList",zcModelList); List<TServerCarmodel> kcModelList = itServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 2).eq("state", 1)); model.addAttribute("kcModelList",kcModelList); //查询经营业务配置 Integer isSpe = 1; //默认显示所有 Integer isTaxi = 1; Integer isCross = 1; TCompany businessCompany = null; //用于查询经营业务的公司对象 if (2 == roleType) { //分公司 businessCompany = tCompanyService.selectById(shiroExtUtil.getUser().getObjectId()); } else if (3 == roleType) { //加盟商 TCompany franchisee = tCompanyService.selectById(shiroExtUtil.getUser().getObjectId()); if (SinataUtil.isNotEmpty(franchisee) && SinataUtil.isNotEmpty(franchisee.getSuperiorId())) { businessCompany = tCompanyService.selectById(franchisee.getSuperiorId()); } } if (SinataUtil.isNotEmpty(businessCompany)) { isSpe = businessCompany.getIsSpe() != null ? businessCompany.getIsSpe() : 1; isTaxi = businessCompany.getIsTaxi() != null ? businessCompany.getIsTaxi() : 1; isCross = businessCompany.getIsCross() != null ? businessCompany.getIsCross() : 1; } model.addAttribute("isSpe", isSpe); model.addAttribute("isTaxi", isTaxi); model.addAttribute("isCross", isCross); return PREFIX + "tCar_add.html"; } @@ -237,6 +263,32 @@ //车辆类型 List<TCarModel> modelList = tCarModelService.selectList(new EntityWrapper<TCarModel>().eq("brandId",tCar.getCarBrandId()).eq("state", 1)); model.addAttribute("modelList",modelList); //查询经营业务配置 Integer isSpe = 1; //默认显示所有 Integer isTaxi = 1; Integer isCross = 1; TCompany businessCompany = null; //用于查询经营业务的公司对象 if (2 == roleType) { //分公司 businessCompany = tCompanyService.selectById(shiroExtUtil.getUser().getObjectId()); } else if (3 == roleType) { //加盟商 TCompany franchisee = tCompanyService.selectById(shiroExtUtil.getUser().getObjectId()); if (SinataUtil.isNotEmpty(franchisee) && SinataUtil.isNotEmpty(franchisee.getSuperiorId())) { businessCompany = tCompanyService.selectById(franchisee.getSuperiorId()); } } if (SinataUtil.isNotEmpty(businessCompany)) { isSpe = businessCompany.getIsSpe() != null ? businessCompany.getIsSpe() : 1; isTaxi = businessCompany.getIsTaxi() != null ? businessCompany.getIsTaxi() : 1; isCross = businessCompany.getIsCross() != null ? businessCompany.getIsCross() : 1; } model.addAttribute("isSpe", isSpe); model.addAttribute("isTaxi", isTaxi); model.addAttribute("isCross", isCross); return PREFIX + "tCar_edit.html"; }
@@ -243,8 +243,6 @@ //系统用户对象 User user = userService.selectOne(new EntityWrapper<User>().eq("roleType", 3).eq("objectId", tCompanyId)); model.addAttribute("user", user); // 传递当前用户角色类型，用于控制非平台账号禁用经营业务和经营区域编辑 model.addAttribute("roleType", shiroExtUtil.getUser().getRoleType()); return PREFIX + "tCompany_updateFranchisee.html"; }
@@ -2037,12 +2037,12 @@ if (count > 0){ continue; } Boolean b = UserUtil.idCardAuth(zero, five); if(!b){ drivers.add(zero); continue; } // // Boolean b = UserUtil.idCardAuth(zero, five); // if(!b){ // drivers.add(zero); // continue; // } //判断性别 if (!two.equals("男") && !two.equals("女")){ return new ErrorTip(500, "性别内容不正确"); @@ -2096,7 +2096,7 @@ } // 校验从业地是否在公司经营区域内 String placeError = validatePlaceOfEmployment(companyId, cell1701); String placeError = validatePlaceOfEmployment(companyId, cell1701, 2); if (placeError != null) { return new ErrorTip(500, placeError); } @@ -2422,7 +2422,7 @@ } // 校验从业地是否在公司经营区域内 String placeError = validatePlaceOfEmployment(companyId, cell1701); String placeError = validatePlaceOfEmployment(companyId, cell1701, 3); if (placeError != null) { return new ErrorTip(500, placeError); } @@ -2568,10 +2568,19 @@ * @param placeOfEmployment 从业地行政编号 * @return 错误信息，null表示校验通过 */ private String validatePlaceOfEmployment(Integer companyId, String placeOfEmployment) { private String validatePlaceOfEmployment(Integer companyId, String placeOfEmployment, Integer roleType) { if (companyId == null || SinataUtil.isEmpty(placeOfEmployment)) { return null; } if (roleType.equals(3)) { //查询该加盟商所属的分公司 TCompany tCompany = tCompanyService.selectById(companyId); if (Objects.nonNull(tCompany) && Objects.nonNull(tCompany.getSuperiorId())) { companyId = tCompany.getSuperiorId(); } else { return null; } } List<TCompanyCity> companyCityList = tCompanyCityService.selectList( new EntityWrapper<TCompanyCity>().eq("companyId", companyId).eq("state", 1)); if (companyCityList == null || companyCityList.isEmpty()) { ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TAbnormalOrderCarController.java
@@ -20,6 +20,7 @@ import com.stylefeng.guns.modular.system.util.qianyuntong.OrderUtil; import com.stylefeng.guns.modular.system.util.qianyuntong.model.*; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.data.domain.Sort; @@ -196,11 +197,9 @@ Map<String, Object> item = tOrderPrivateCarService.getPrivateCarOrderDetailById(tOrderPrivateCarId); Object o1 = item.get("abnormalImg"); if(o1!=null){ if(o1!=null && !o1.toString().equals("")){ String[] split = o1.toString().split(","); model.addAttribute("abnormalImg",split); }else { model.addAttribute("abnormalImg",new String[]{}); } // money是修改后的金额 model.addAttribute("money",0); ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAbnormalOrderCar/tAbnormalOrder_orderDetail.html
@@ -248,9 +248,11 @@ </div> <div class="img-list"> <!-- 逗号拼接的图片 --> @for(item in abnormalImg) { @if(isNotEmpty(abnormalImg!)){ @for(item in abnormalImg!) { <img onclick="lookBigImg('${item}')" src="${item}" alt="图片" style="max-width:250px;"/> @} @} </div> <!-- 你可以根据实际图片地址替换上面src --> <div class="section-title" id="s1">处理状态： ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/tCar_add.html
@@ -49,18 +49,24 @@ <fieldset> <label class="col-sm-3 control-label">服务模式：</label> <div class="col-sm-9"> @if(roleType == 1 || isSpe == 1){ <div class="checkbox checkbox-success checkbox-inline"> <input type="checkbox" name="serverBox" id="serverBox1" value="1" onclick="TCarInfoDlg.zcServerClick()"> <label for="serverBox1"> 快车 </label> </div> @} @if(roleType == 1 || isTaxi == 1){ <div class="checkbox checkbox-success checkbox-inline"> <input type="checkbox" name="serverBox" id="serverBox2" value="2"> <label for="serverBox2"> 出租车 </label> </div> @} @if(roleType == 1 || isCross == 1){ <div class="checkbox checkbox-success checkbox-inline"> <input type="checkbox" name="serverBox" id="serverBox3" value="3" onclick="TCarInfoDlg.kcServerClick()"> <label for="serverBox3"> 跨城出行 </label> </div> @} <!-- <div class="checkbox checkbox-success checkbox-inline">--> <!-- <input type="checkbox" name="serverBox" id="serverBox4" value="4">--> <!-- <label for="serverBox4"> 小件物流-同城 </label>--> ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/tCar_edit.html
@@ -52,18 +52,24 @@ <fieldset> <label class="col-sm-3 control-label">服务模式：</label> <div class="col-sm-9"> @if(roleType == 1 || isSpe == 1){ <div class="checkbox checkbox-success checkbox-inline"> <input type="checkbox" name="serverBox" id="serverBox1" value="1" ${2 == one ? 'checked=checked' : ''} onclick="TCarInfoDlg.zcServerClick()"> <label for="serverBox1"> 快车 </label> </div> @} @if(roleType == 1 || isTaxi == 1){ <div class="checkbox checkbox-success checkbox-inline"> <input type="checkbox" name="serverBox" id="serverBox2" value="2" ${2 == two ? 'checked=checked' : ''}> <label for="serverBox2"> 出租车 </label> </div> @} @if(roleType == 1 || isCross == 1){ <div class="checkbox checkbox-success checkbox-inline"> <input type="checkbox" name="serverBox" id="serverBox3" value="3" ${2 == three ? 'checked=checked' : ''} onclick="TCarInfoDlg.kcServerClick()"> <label for="serverBox3"> 跨城出行 </label> </div> @} <!-- <div class="checkbox checkbox-success checkbox-inline">--> <!-- <input type="checkbox" name="serverBox" id="serverBox4" value="4" ${2 == four ? 'checked=checked' : ''}>--> <!-- <label for="serverBox4"> 小件物流-同城 </label>--> ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_detailFranchisee.html
@@ -21,37 +21,43 @@ <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" disabled type="checkbox" value="1" ${1== item.isSpe ? 'checked=checked' : ''} > <input name="checkbox" id="checkbox1" type="checkbox" value="1" ${1== item.isSpe ? 'checked=checked' : ''} onclick="FranchiseeInfoDlg.checkbox1()"> <label for="checkbox1"> 快车 </label> <fieldset> <div class="row" style="display: none;" id="zcDiv"> <#button btnCss="info" name="设置司机抽成" id="Spe1" icon="fa-check" clickFun="TLineInfoDlg.set2('Spe')"/> <#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> </div> </fieldset> </div> @} @if(roleType == 1 || (roleType == 2 && company.isTaxi == 1)){ <div class="checkbox checkbox-primary"> <input name="checkbox" id="checkbox2" type="checkbox" disabled value="2" ${1== item.isTaxi ? 'checked=checked' : ''}> <input name="checkbox" id="checkbox2" type="checkbox" value="2" ${1== item.isTaxi ? 'checked=checked' : ''} onclick="FranchiseeInfoDlg.checkbox2()"> <label for="checkbox2"> 出租车 </label> <fieldset> <div class="row" style="display: none;" id="czDiv"> <#button btnCss="info" name="设置司机抽成" id="rakeRate" icon="fa-check" clickFun="TLineInfoDlg.set2('Taxi')"/> <#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> @} @if(roleType == 1 || (roleType == 2 && company.isCross == 1)){ <div class="checkbox checkbox-success"> <input name="checkbox" id="checkbox3" type="checkbox" disabled value="3" ${1== item.isCross ? 'checked=checked' : ''} > <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" disabled value="4" ${1 == item.isSameLogistics ? 'checked=checked' : ''} >--> <!-- <label for="checkbox4">--> @@ -92,18 +98,24 @@ <!-- <#button btnCss="info" name="设置司机抽成" id="rakeRate" icon="fa-check" clickFun="TLineInfoDlg.set2('OnCall')"/>--> <!-- <textarea id="OnCall" rows="5" cols="50" hidden="hidden" value="${item.OnCall}" >${item.OnCall}</textarea>--> <!-- </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' : ''} > <input id="checkbox8" name="checkbox" onclick="TCompanyInfoDlg.checkbox8()" 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' : ''} > <input id="checkbox9" name="checkbox" onclick="TCompanyInfoDlg.checkbox9()" type="checkbox" value="9" ${1 == item.isSubstituteDriving ? 'checked=checked' : ''}> <label for="checkbox9"> 代驾 </label> </div> @} </fieldset> </div> </fieldset> ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tDriver/yesDriver_info.js
@@ -718,21 +718,7 @@ * 添加线路操作 */ YesDriverInfoDlg.addLine = function () { var companyType = $("input[name='companyType']:checked").val(); var oneId = $("#oneId").val() if (1 != companyType && (oneId==null || oneId == '')){ Feng.info("请选择所属公司在添加线路"); return; } var selectLineName = $("#selectLineId option:selected").text(); if ("" == selectLineName || null == selectLineName){ Feng.info("请选择关联线路"); return; } var selectLineId = $("#selectLineId").val(); if ("" == selectLineId){ Feng.info("选择关联线路");
