From a8ed019b45db80f0f305b4a3b78af65ed4d7cf51 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Fri, 22 Jul 2022 09:36:30 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=9C=AA=E5=94=AE=E4=B9=B0=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml index 15fd1a00ef..883c0f1c28 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml @@ -686,7 +686,6 @@ LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid` ${ew.sqlSegment} - and length(bv.salesDate)>0 From 3c495636c605fbaf398637a36927b97835389d4a Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Fri, 22 Jul 2022 09:39:46 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=B0=83=E8=BD=A6=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E8=BD=A6=E8=BE=86=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3=E5=BC=80?= =?UTF-8?q?=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/basevehicle/BaseVehicleFeign.java | 4 + .../basevehicle/BaseVehicleFeignFallback.java | 5 ++ .../biz/basevehicle/BaseVehicleMapper.java | 2 + .../biz/basevehicle/BaseVehicleMapper.xml | 30 +++++++ .../base/biz/basevehicle/BaseVehicleRest.java | 7 ++ .../biz/basevehicle/BaseVehicleService.java | 82 +++++++++++++++++++ 6 files changed, 130 insertions(+) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java index 57630b659e..602b561a9f 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java @@ -225,6 +225,10 @@ public interface BaseVehicleFeign { @PostMapping("/vehicleActualList") ResultBean> vehicleActualList(@RequestBody PagerQuery pagerQuery); + @ApiOperation("调车申请选择车辆分页列表") + @PostMapping("/vehiclePurchaseList") + ResultBean> vehiclePurchaseList(@RequestBody PagerQuery pagerQuery); + @ApiOperation("销售订单选择现车分页列表") @PostMapping("/selectVo") ResultBean> selectVo(@RequestBody PagerQuery pcBaseVehicleOrderQuery); diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java index a3c04886f1..aa274c673e 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java @@ -136,6 +136,11 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign { return null; } + @Override + public ResultBean> vehiclePurchaseList(PagerQuery pagerQuery) { + return null; + } + @Override public ResultBean> selectVo(PagerQuery pcBaseVehicleOrderQuery) { return null; diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java index 987fdc843c..45241c0bc6 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java @@ -388,4 +388,6 @@ public interface BaseVehicleMapper extends BaseMapper { * @return */ IPage selectCostVehicleList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + IPage vehiclePurchasePageList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml index 883c0f1c28..34b03829eb 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml @@ -838,4 +838,34 @@ ${ew.sqlSegment} + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java index 67489dccf0..f8514981c5 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java @@ -366,6 +366,13 @@ public class BaseVehicleRest implements BaseVehicleFeign { return rb.success().setData(pv); } + @Override + public ResultBean> vehiclePurchaseList(PagerQuery pagerQuery) { + ResultBean> rb = ResultBean.fireFail(); + PagerVo pv = baseVehicleService.vehiclePurchaseList(pagerQuery); + return rb.success().setData(pv); + } + @Override public ResultBean> selectVo(PagerQuery pcBaseVehicleOrderQuery) { ResultBean> rb = ResultBean.fireFail(); diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java index 0dd7cd24d2..e8ebf76414 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java @@ -1102,6 +1102,88 @@ public class BaseVehicleService extends MybatisBaseService vehiclePurchaseList(PagerQuery pagerQuery) { + IPage page = vehiclePurchasePageList(pagerQuery); + PagerVo pv = new PagerVo<>(); + PagerVo pv1 = PagerUtil.pageToVo(page, pv); + return pv1; + } + + private IPage vehiclePurchasePageList(PagerQuery pagerQuery) { + IPage page = PagerUtil.queryToPage(pagerQuery); + QueryWrapper qw = vehiclePurchaseWrapper(pagerQuery.getParams()); + return baseMapper.vehiclePurchasePageList(page, qw); + } + + private QueryWrapper vehiclePurchaseWrapper(BaseVehicleReturnQuery params) { + QueryWrapper qw = new QueryWrapper<>(); + if (params != null) { + if (StringUtils.isNotBlank(params.getUserSid())) { + String orgSid = sysStaffOrgFeign.getPathSidByUserSid(params.getUserSid()).getData(); + qw.eq("bv.useOrgSid", orgSid); + + } + //品牌 + if (StringUtils.isNotBlank(params.getBrandSid())) { + qw.eq("bvm.carBrand", params.getBrandSid()); + } + //功能 + if (StringUtils.isNotBlank(params.getVehicleType())) { + qw.eq("bvm.vehicleType", params.getVehicleType()); + } + //系列 + if (StringUtils.isNotBlank(params.getProductLine())) { + qw.eq("bvm.productLine", params.getProductLine()); + } + //变速箱 + if (StringUtils.isNotBlank(params.getGearboxType())) { + qw.eq("bvm.gearboxType", params.getGearboxType()); + } + //驱动 + if (StringUtils.isNotBlank(params.getDriveForm())) { + qw.eq("bvm.driveForm", params.getDriveForm()); + } + //排放标准 + if (StringUtils.isNotBlank(params.getEmissionStandard())) { + qw.eq("bvm.emissionStandard", params.getEmissionStandard()); + } + //马力 + if (StringUtils.isNotBlank(params.getPower())) { + qw.eq("bvm.power", params.getPower()); + } + //燃料 + if (StringUtils.isNotBlank(params.getFuelType())) { + qw.eq("bvm.fuelType", params.getFuelType()); + } + //版本 + if (StringUtils.isNotBlank(params.getVehicleVersion())) { + qw.eq("bvm.vehicleVersion", params.getVehicleVersion()); + } + //车型 + if (StringUtils.isNotBlank(params.getVehicleAlias())) { + qw.like("bvm.vehicleAlias", params.getVehicleAlias()); + } + //快捷检索车型 + if (StringUtils.isNotBlank(params.getModelName())) { + qw.like("bvm.modelName", params.getModelName()); + } + if (params.getVinNoList().size() > 0) { + qw.notIn("bv.vinNo", params.getVinNoList()); + } + //锁定状态：未锁定 + qw.eq("bv.settlementStatus", VehicleState.LockEnum.UN_LOCK.getCode()); + //库存状态：库存 + qw.eq("bv.vehicleState", VehicleState.StockEnum.STOCK.getCode()); + } + return qw; + } + /** * 未售买断车辆的数据 * From f86b475ddc38f78f7f09bf36ec7ffdacd78cfed1 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Fri, 22 Jul 2022 10:12:17 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=85=AC=E5=85=B1?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- anrui-scm/anrui-scm-ui/src/styles/index.scss | 79 ++++++-------------- 1 file changed, 21 insertions(+), 58 deletions(-) diff --git a/anrui-scm/anrui-scm-ui/src/styles/index.scss b/anrui-scm/anrui-scm-ui/src/styles/index.scss index 6282271803..adcc71708b 100644 --- a/anrui-scm/anrui-scm-ui/src/styles/index.scss +++ b/anrui-scm/anrui-scm-ui/src/styles/index.scss @@ -131,7 +131,13 @@ div:focus { .main-content{ overflow-x: hidden;overflow-y: auto;height: calc(100vh - 200px);padding: 0 20px;} .listcon{height: calc(100vh - 425px);overflow-y: auto;overflow-x: hidden;} .listconadd{height: calc(100vh - 200px);overflow-y: auto;overflow-x: hidden;} - +.listconadd{ + .titwu { + font-size: 28px; + text-align: center; + padding-bottom: 30px; + } +} .listconsub { height: calc(100vh - 310px); overflow-y: auto; @@ -256,63 +262,15 @@ div:focus { } -.formaddcopy { - padding: 20px 0; - .title { - padding: 10px;font-weight: bold; - font-size: 20px; - background-color: $header-bg; - text-align: center; - color: #ffffff; - } - .el-row { - display:flex; - flex-wrap: wrap; - border-left: 1px solid $table-border-color; - .el-col{ - display: flex; - justify-content: flex-start; - align-items: center; - border-right: 1px solid $table-border-color; - border-bottom: 1px solid $table-border-color; - min-height: 48px; - line-height: 1; - .spanOneWidth { - width: 100px; - } - .spanThreeWidth { - width: 70px; - } - .spanType { - text-align: right; - font-size: 14px; - color: #606266; - font-weight: 600; - border-right: 1px solid $table-border-color; - padding: 0 10px !important; - line-height: 48px; - } - .el-form-item{ - padding: 0 10px !important; - margin-bottom: 0; - .addinputw { width: 80%; } - } - } - - } - .footer{margin: 20px;} -} - .formaddcopy02 { - padding: 20px 0; - // height: calc(100vh - 200px);overflow-y: auto; + padding: 30px 40px 0 40px; .title { - padding: 10px; + padding: 12px; font-weight: bold; - font-size: 20px; - background-color: $header-bg; - text-align: center; + font-size: 16px; + background-color: #0294d7; color: #ffffff; + text-align: left; } .el-row { @@ -323,14 +281,16 @@ div:focus { .el-col { border-right: 1px solid $table-border-color; border-bottom: 1px solid $table-border-color; - min-height: 48px; + min-height: 42px; + padding: 0 15px; + line-height: 42px; position: relative; .span-sty { position: absolute; top: 0; bottom: 0; left: 0; - line-height: 48px; + line-height: 42px; text-align: right; font-size: 14px; color: #606266; @@ -342,7 +302,7 @@ div:focus { .el-form-item { margin-bottom: 0; - + line-height: 42px; .addinputw { padding: 5px 0; width: 65%; @@ -351,9 +311,12 @@ div:focus { .addinputInfo { margin-left: 80px; - line-height: 48px; + line-height: 42px; } + .el-input__inner { + height: 36px; + } } }