From d11e5e3d10be343ca8c3385030cb11a413310316 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Wed, 28 Sep 2022 10:02:01 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E9=94=80?= =?UTF-8?q?=E5=94=AE=E8=AE=A2=E5=8D=95=E4=BF=9D=E5=AD=98=E8=BD=A6=E6=9E=B6?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/biz/basevehicle/BaseVehicleService.java | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) 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 95df9a88ec..30e7bff4dd 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 @@ -28,8 +28,8 @@ import com.yxt.anrui.base.common.enums.ManPurOrderType; import com.yxt.anrui.base.common.enums.VehicleState; import com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusMainDepositFeign; import com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusMainDepositVehicleQuery; -import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign; +import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDetailsVo; import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempDto; import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; @@ -2551,8 +2551,8 @@ public class BaseVehicleService extends MybatisBaseService record : pcInspectionVinList) { String addressSid = record.get("addressSid"); ScmWarehouseVo data = scmWarehouseFeign.selectByAddressSid(addressSid).getData(); - record.put("administratorsSid",data.getLibTubeSid()); - record.put("administratorsName",data.getLibTubeName()); + record.put("administratorsSid", data.getLibTubeSid()); + record.put("administratorsName", data.getLibTubeName()); } return pcInspectionVinList; } @@ -2567,7 +2567,14 @@ public class BaseVehicleService extends MybatisBaseService 0) { qw.notIn("bv.vinNo", params.getList()); } - qw.in("bv.orderingNo", list); + //根据销售订单sid查询订单是否是排产 + ResultBean resultBean = busSalesOrderFeign.getSaleOrderDetails(params.getSaleOrderSid()); + if (resultBean.getSuccess()) { + if ("采购订单".equals(resultBean.getData().getOrderType())) { + qw.in("bv.orderingNo", list); + } + } + } IPage pagging = baseMapper.saleOrderVin(page, qw, params.getNames()); PagerVo p = PagerUtil.pageToVo(pagging, null); From 4b740f8ef068f58e82a313c977042afa948f22c1 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Wed, 28 Sep 2022 11:52:45 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E9=94=80?= =?UTF-8?q?=E5=94=AE=E8=AE=A2=E5=8D=95=E9=80=89=E6=8B=A9=E8=BD=A6=E6=9E=B6?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../buscenter/api/bussalesorder/BusSalesOrderFeign.java | 4 ++-- .../buscenter/biz/bussalesorder/BusSalesOrderMapper.xml | 3 ++- .../autoservice/saleOrders/AppBusSalesOrderFeign.java | 2 +- .../api/autoservice/saleOrders/vininput/InputVinVo.java | 9 +++++---- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java index 54c7712369..fa21436948 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java @@ -201,14 +201,14 @@ public interface BusSalesOrderFeign { ResultBean submitOrder(@RequestBody SubmitSalesOrderDto dto); @ApiOperation("初始化|录入车架号列表") - @GetMapping("/saleOrderInputVin") + @GetMapping("/saleOrderInputVin/{saleOrderSid}") @ResponseBody ResultBean saleOrderInputVin(@PathVariable("saleOrderSid") String saleOrderSid); @ApiOperation("采购订单编号list") @GetMapping("/getList/{saleOrderSid}") @ResponseBody - ResultBean> getList(String saleOrderSid); + ResultBean> getList(@PathVariable("saleOrderSid") String saleOrderSid); @ApiOperation("保存销售订单车架号") @PostMapping("/saveSaleOrderInputVin") diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml index 5a02647ac6..dd3d0ffe07 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml @@ -57,7 +57,8 @@ if(bo.nodeState = '已办结', true, false) as showContractBtn, bo.nodeState is null as showUpdateBtn, bo.nodeState is null as showDeleteBtn, - 0 as showFinancialBtn + 0 as showFinancialBtn, + bo.type FROM bus_sales_order bo diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeign.java index d9f7c182b5..dc582d018f 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeign.java @@ -271,7 +271,7 @@ public interface AppBusSalesOrderFeign { /*-------------------------------录入车架号---------------------------------------------*/ @ApiOperation("初始化|录入车架号列表") - @GetMapping("/init/saleOrderInputVin") + @GetMapping("/init/saleOrderInputVin/{saleOrderSid}") @ResponseBody ResultBean getVinList(@PathVariable("saleOrderSid") String saleOrderSid); diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/vininput/InputVinVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/vininput/InputVinVo.java index e7950f48c4..0ad47b54d9 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/vininput/InputVinVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/vininput/InputVinVo.java @@ -1,5 +1,6 @@ package com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput; +import com.fasterxml.jackson.annotation.JsonProperty; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -12,10 +13,10 @@ import lombok.Data; @Data public class InputVinVo implements Vo { private static final long serialVersionUID = -3495013067534199733L; - @ApiModelProperty("车架号") - private String vin; - @ApiModelProperty("车辆sid") - private String carSid; @ApiModelProperty("是否已出库") private Boolean state; + @JsonProperty("vin") + private String vinNo; + @JsonProperty("carSid") + private String vinSid; } From 953e2cb0df49f39f163b247ab7a906cc72f68456 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Wed, 28 Sep 2022 11:58:54 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E9=94=80?= =?UTF-8?q?=E5=94=AE=E8=AE=A2=E5=8D=95=E5=88=9D=E5=A7=8B=E5=8C=96=E8=BD=A6?= =?UTF-8?q?=E6=9E=B6=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index 5e455ae30b..1d0195e401 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java @@ -2640,6 +2640,8 @@ public class BusSalesOrderService extends MybatisBaseService Date: Wed, 28 Sep 2022 14:25:01 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E9=94=80?= =?UTF-8?q?=E5=94=AE=E8=AE=A2=E5=8D=95=E5=B8=B8=E7=94=A8=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E3=80=81=E8=AF=A2=E4=BB=B7=E5=B8=B8=E7=94=A8=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=8E=E8=BD=A6=E5=9E=8B=E7=AE=80=E4=BB=8B?= =?UTF-8?q?=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseModelConfigService.java | 6 +- .../biz/basevehicle/BaseVehicleService.java | 70 +++++++++++++++++-- 2 files changed, 69 insertions(+), 7 deletions(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigService.java index c6f58edac8..dc5dba99f7 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigService.java @@ -641,8 +641,8 @@ public class BaseModelConfigService extends MybatisBaseService addDonfigName(List appModelConfigListVos) { for (AppModelConfigListVo appModelConfigListVo : appModelConfigListVos) { //颜色 - String color = StringUtils.isNotBlank(appModelConfigListVo.getCarColor()) - ? (appModelConfigListVo.getCarColor() + "/") : ""; + /* String color = StringUtils.isNotBlank(appModelConfigListVo.getCarColor()) + ? (appModelConfigListVo.getCarColor() + "/") : "";*/ //缓速器 // String slowMachine = StringUtils.isNotBlank(appModelConfigListVo.getSlowMachine()) // && "有".equals(appModelConfigListVo.getSlowMachine()) ? ("缓速器" + "/") : ""; @@ -708,7 +708,7 @@ public class BaseModelConfigService extends MybatisBaseService Date: Wed, 28 Sep 2022 16:22:41 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E6=98=A0=E5=B0=84=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/sysmapping/SysMappingFeign.java | 5 + .../sysmapping/SysMappingFeignFallback.java | 5 + .../api/sysmapping/SysMappingInfoQuery.java | 25 +++++ .../api/sysmapping/SysMappingInfoVo.java | 27 ++++++ .../api/sysmapping/SysMappingQuery.java | 3 +- .../biz/sysmapping/SysMappingMapper.java | 21 +++-- .../biz/sysmapping/SysMappingMapper.xml | 17 ++++ .../portal/biz/sysmapping/SysMappingRest.java | 93 ++++++++++--------- .../biz/sysmapping/SysMappingService.java | 29 ++++-- 9 files changed, 163 insertions(+), 62 deletions(-) create mode 100644 anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingInfoQuery.java create mode 100644 anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingInfoVo.java diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingFeign.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingFeign.java index 498c13190f..d710445e2d 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingFeign.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingFeign.java @@ -80,4 +80,9 @@ public interface SysMappingFeign { @PostMapping("/saveMappingList") @ResponseBody public ResultBean saveMappingList(@RequestBody List dto); + + @ApiOperation("根据条件查询详情") + @PostMapping("/selectMappingInfo") + @ResponseBody + public ResultBean selectMappingInfo(@RequestBody SysMappingInfoQuery query); } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingFeignFallback.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingFeignFallback.java index 7da2d7bd81..1aa609b3c8 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingFeignFallback.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingFeignFallback.java @@ -74,4 +74,9 @@ public class SysMappingFeignFallback implements SysMappingFeign { public ResultBean saveMappingList(List dto) { return null; } + + @Override + public ResultBean selectMappingInfo(SysMappingInfoQuery query) { + return null; + } } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingInfoQuery.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingInfoQuery.java new file mode 100644 index 0000000000..91a82748bd --- /dev/null +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingInfoQuery.java @@ -0,0 +1,25 @@ +package com.yxt.anrui.portal.api.sysmapping; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class SysMappingInfoQuery implements Query { + private static final long serialVersionUID = 5179141159925489016L; + + @ApiModelProperty("映射来源，如CWXT等") + private String map_sourceKey; // 映射来源，如CWXT等 + + @ApiModelProperty("映射实体，如付款单") + private String map_object; // 映射实体，如付款单 + + @ApiModelProperty("映射项目类别，如应付类别") + private String map_item; // 映射项目类别，如应付类别 + + @ApiModelProperty("数据字典类别编码") + private String dictTypeCode; // 数据字典类别编码 + + @ApiModelProperty("数据key") + private String dictKey; // 数据key +} diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingInfoVo.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingInfoVo.java new file mode 100644 index 0000000000..f6aa7a47d1 --- /dev/null +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingInfoVo.java @@ -0,0 +1,27 @@ +package com.yxt.anrui.portal.api.sysmapping; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class SysMappingInfoVo implements Vo { + + + private static final long serialVersionUID = -4909774998558087805L; + + @ApiModelProperty("数据字典sid") + private String dictSid; // 数据字典sid + @ApiModelProperty("映射来源，如CWXT等") + private String map_sourceKey; // 映射来源，如CWXT等 + @ApiModelProperty("映射来源，如财务系统等") + private String map_sourceValue; // 映射来源，如财务系统等 + @ApiModelProperty("映射实体，如付款单") + private String map_object; // 映射实体，如付款单 + @ApiModelProperty("映射项目类别，如应付类别") + private String map_item; // 映射项目类别，如应付类别 + @ApiModelProperty("项目key，如002") + private String map_itemKey; // 项目key，如002 + @ApiModelProperty("项目value，如外采") + private String map_itemValue; // 项目value，如外采 +} diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingQuery.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingQuery.java index 8f2ae3a302..4c770a10f5 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingQuery.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingQuery.java @@ -49,7 +49,8 @@ import lombok.Data; @ApiModel(value = "数据映射 查询条件", description = "数据映射 查询条件") public class SysMappingQuery implements Query { - @ApiModelProperty("数据字典sid") + private static final long serialVersionUID = -546734185535363676L; + @ApiModelProperty("数据字典sid") private String dictSid; // 数据字典sid @ApiModelProperty("映射来源，如CWXT等") private String map_sourceKey; // 映射来源，如CWXT等 diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingMapper.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingMapper.java index b450288b48..0020c83dea 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingMapper.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingMapper.java @@ -30,6 +30,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.anrui.portal.api.sysmapping.SysMappingInfoVo; import com.yxt.anrui.portal.api.sysmapping.SysMappingQuery; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -55,13 +56,15 @@ import java.util.List; @Mapper public interface SysMappingMapper extends BaseMapper { - //@Update("update sys_mapping set name=#{msg} where id=#{id}") - //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - - List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); - - @Select("select * from sys_mapping") - List selectListVo(); + //@Update("update sys_mapping set name=#{msg} where id=#{id}") + //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); + + @Select("select * from sys_mapping") + List selectListVo(); + + SysMappingInfoVo selectMappingInfo(@Param(Constants.WRAPPER) QueryWrapper qw); } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingMapper.xml b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingMapper.xml index c9ff246464..a596f7a84b 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingMapper.xml +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingMapper.xml @@ -28,4 +28,21 @@ SELECT * FROM sys_mapping ${ew.sqlSegment} + + + \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingRest.java index 8167fd0dc7..19db2ebc09 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingRest.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingRest.java @@ -26,6 +26,7 @@ package com.yxt.anrui.portal.biz.sysmapping; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.portal.api.sysmapping.*; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; @@ -36,12 +37,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.List; -import com.yxt.anrui.portal.api.sysmapping.SysMapping; -import com.yxt.anrui.portal.api.sysmapping.SysMappingQuery; -import com.yxt.anrui.portal.api.sysmapping.SysMappingVo; -import com.yxt.anrui.portal.api.sysmapping.SysMappingDetailsVo; -import com.yxt.anrui.portal.api.sysmapping.SysMappingDto; -import com.yxt.anrui.portal.api.sysmapping.SysMappingFeign; /** * Project: sysmapping(sysmapping)
@@ -61,52 +56,58 @@ import com.yxt.anrui.portal.api.sysmapping.SysMappingFeign; @RequestMapping("v1/sysmapping") public class SysMappingRest implements SysMappingFeign { - @Autowired - private SysMappingService sysMappingService; + @Autowired + private SysMappingService sysMappingService; - @Override - @ApiOperation("根据条件分页查询数据的列表") - @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq){ - ResultBean rb = ResultBean.fireFail(); - PagerVo page = new PagerVo<>(); - IPage iPage = sysMappingService.listPageVo(pq); - PagerVo pagerVo = PagerUtil.pageToVo(iPage, page); - return new ResultBean>().success().setData(pagerVo); + @Override + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq) { + PagerVo page = new PagerVo<>(); + IPage iPage = sysMappingService.listPageVo(pq); + PagerVo pagerVo = PagerUtil.pageToVo(iPage, page); + return new ResultBean>().success().setData(pagerVo); - } + } - @Override - @ApiOperation("新增或修改") - @PostMapping("/save") - public ResultBean save(@RequestBody SysMappingDto dto){ - ResultBean rb = ResultBean.fireFail(); - sysMappingService.saveOrUpdateDto(dto); - return rb.success(); - } + @Override + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody SysMappingDto dto) { + ResultBean rb = ResultBean.fireFail(); + sysMappingService.saveOrUpdateDto(dto); + return rb.success(); + } - @Override - @ApiOperation("根据sid批量删除") + @Override + @ApiOperation("根据sid批量删除") @PostMapping("/delBySids") - public ResultBean delBySids(@RequestBody String[] sids){ - ResultBean rb = ResultBean.fireFail(); - sysMappingService.delBySids(sids); - return rb.success(); - } + public ResultBean delBySids(@RequestBody String[] sids) { + ResultBean rb = ResultBean.fireFail(); + sysMappingService.delBySids(sids); + return rb.success(); + } - @Override - @ApiOperation("根据SID获取一条记录") + @Override + @ApiOperation("根据SID获取一条记录") @GetMapping("/fetchDetailsBySid/{sid}") - public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ - ResultBean rb = ResultBean.fireFail(); - SysMappingDetailsVo vo = sysMappingService.fetchDetailsVoBySid(sid); - return rb.success().setData(vo); - } + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid) { + ResultBean rb = ResultBean.fireFail(); + SysMappingDetailsVo vo = sysMappingService.fetchDetailsVoBySid(sid); + return rb.success().setData(vo); + } - @Override - public ResultBean saveMappingList(List dto) { - ResultBean rb = ResultBean.fireFail(); - sysMappingService.saveMappingList(dto); - return rb.success(); - } + @Override + public ResultBean saveMappingList(List dto) { + ResultBean rb = ResultBean.fireFail(); + sysMappingService.saveMappingList(dto); + return rb.success(); + } + + @Override + public ResultBean selectMappingInfo(SysMappingInfoQuery query) { + ResultBean rb = ResultBean.fireFail(); + SysMappingInfoVo vo = sysMappingService.selectMappingInfo(query); + return rb.success().setData(vo); + } } diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingService.java index 2bec9b3548..57398f04a7 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingService.java @@ -28,15 +28,11 @@ package com.yxt.anrui.portal.biz.sysmapping; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.portal.api.sysmapping.*; import org.apache.commons.lang3.StringUtils; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; -import com.yxt.anrui.portal.api.sysmapping.SysMapping; -import com.yxt.anrui.portal.api.sysmapping.SysMappingQuery; -import com.yxt.anrui.portal.api.sysmapping.SysMappingVo; -import com.yxt.anrui.portal.api.sysmapping.SysMappingDetailsVo; -import com.yxt.anrui.portal.api.sysmapping.SysMappingDto; import org.springframework.stereotype.Service; import java.util.List; @@ -71,7 +67,7 @@ public class SysMappingService extends MybatisBaseService queryWrapper(SysMappingQuery query) { - QueryWrapper qw = queryWrapper(query); + QueryWrapper qw = new QueryWrapper<>(); if (StringUtils.isNotBlank(query.getMap_sourceKey())) { qw.eq("sm.map_sourceKey", query.getMap_sourceKey()); } @@ -146,4 +142,25 @@ public class SysMappingService extends MybatisBaseService qw = new QueryWrapper<>(); + if (StringUtils.isNotBlank(query.getMap_sourceKey())) { + qw.eq("sm.map_sourceKey", query.getMap_sourceKey()); + } + if (StringUtils.isNotBlank(query.getMap_object())) { + qw.eq("sm.map_object", query.getMap_object()); + } + if (StringUtils.isNotBlank(query.getMap_item())) { + qw.eq("sm.map_item", query.getMap_item()); + } + if (StringUtils.isNotBlank(query.getDictTypeCode())) { + qw.eq("dt.dictTypeCode", query.getDictTypeCode()); + } + if (StringUtils.isNotBlank(query.getDictKey())) { + qw.eq("dc.dictKey", query.getDictKey()); + } + SysMappingInfoVo vo = baseMapper.selectMappingInfo(qw); + return vo; + } } \ No newline at end of file From 3bf0df85d1af4b1b0605adc8329fb8f1c5c563a6 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Wed, 28 Sep 2022 16:46:48 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=9B=98=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- anrui-scm/anrui-scm-ui/src/api/kucunguanli/panku.js | 9 ++++----- .../panku/pankubaogao/pankubaogaoguanli.vue | 12 +++--------- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/anrui-scm/anrui-scm-ui/src/api/kucunguanli/panku.js b/anrui-scm/anrui-scm-ui/src/api/kucunguanli/panku.js index 5189fb5c4e..ea5ed26c16 100644 --- a/anrui-scm/anrui-scm-ui/src/api/kucunguanli/panku.js +++ b/anrui-scm/anrui-scm-ui/src/api/kucunguanli/panku.js @@ -44,14 +44,14 @@ export default { headers: { 'Content-Type': 'application/json' } }) }, - // 盘库报告列表(生成盘库记录) + // 盘库报告(查看盘库报告) getCarInventoryReport: function(data) { return request({ url: '/scm/v1/scmvehinventorymonth/getCarInventoryReport/' + data, - method: 'get', + method: 'get' }) }, - // 盘库报告列表(生成盘库记录) + // 盘库报告(发送盘库报告) sendReport: function(data) { return request({ url: '/scm/v1/scmvehinventoryreport/sendReport', @@ -59,6 +59,5 @@ export default { data: data, headers: { 'Content-Type': 'application/json' } }) - }, - + } } diff --git a/anrui-scm/anrui-scm-ui/src/views/kucunguanli/panku/pankubaogao/pankubaogaoguanli.vue b/anrui-scm/anrui-scm-ui/src/views/kucunguanli/panku/pankubaogao/pankubaogaoguanli.vue index ab18adfb6f..c1eb72a1c3 100644 --- a/anrui-scm/anrui-scm-ui/src/views/kucunguanli/panku/pankubaogao/pankubaogaoguanli.vue +++ b/anrui-scm/anrui-scm-ui/src/views/kucunguanli/panku/pankubaogao/pankubaogaoguanli.vue @@ -11,7 +11,7 @@ 至 - + @@ -101,7 +101,7 @@ import ButtonBar from '@/components/ButtonBar' import req from '@/api/kucunguanli/panku' import pankubaogaoAdd from './pankubaogaoAdd' import pankubaogaoInfo from './pankubaogaoInfo' -import { fetchByUseOrgSid, getPathSidByUserSid } from '@/api/cheliang/dictcommons' +import { getPathSidByUserSid } from '@/api/cheliang/dictcommons' export default { name: 'pankubaogoaguanli', @@ -161,11 +161,6 @@ export default { this.getList() } }) - fetchByUseOrgSid({ sid: this.listQuery.params.createOrgSid }).then((res) => { - if (res.success) { - this.warehouse_list = res.data - } - }) }, // 搜索条件效果 clicksearchShow() { @@ -238,8 +233,7 @@ export default { this.viewState = 1 }, doClose() { - this.$store.dispatch('tagsView/delView', this.$route) - this.$router.go(-1) + this.$emit('doback') } } } From 95829278a1881e43ed2b9389aef166346ae3974b Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Wed, 28 Sep 2022 16:48:01 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=97=A5=E5=B8=B8?= =?UTF-8?q?=E5=B7=A1=E6=A3=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/api/kucunguanli/polling.js | 46 ++- .../uploadFile/upload_morebypicture.vue | 3 +- .../richangxunjian/cheliangxunjian.vue | 53 ++-- .../richangxunjian/cheliangxunjianhandle.vue | 45 ++- .../richangxunjian/daixunjian.vue | 285 ++++++++++++++++++ .../relation/xunjianbaogaoAdd.vue | 145 +++++++++ .../relation/xunjianbaogaoInfo.vue | 81 +++++ .../relation/xunjianbaogaoguanli.vue | 245 +++++++++++++++ .../richangxunjian/xunjiadanInfo.vue | 70 +++-- .../richangxunjian/xunjiandan.vue | 253 ++++++++-------- .../richangxunjian/xunjianresolved.vue | 252 ++++++++++++++++ 11 files changed, 1295 insertions(+), 183 deletions(-) create mode 100644 anrui-scm/anrui-scm-ui/src/views/kucunguanli/cheliangweihu/richangxunjian/daixunjian.vue create mode 100644 anrui-scm/anrui-scm-ui/src/views/kucunguanli/cheliangweihu/richangxunjian/relation/xunjianbaogaoAdd.vue create mode 100644 anrui-scm/anrui-scm-ui/src/views/kucunguanli/cheliangweihu/richangxunjian/relation/xunjianbaogaoInfo.vue create mode 100644 anrui-scm/anrui-scm-ui/src/views/kucunguanli/cheliangweihu/richangxunjian/relation/xunjianbaogaoguanli.vue create mode 100644 anrui-scm/anrui-scm-ui/src/views/kucunguanli/cheliangweihu/richangxunjian/xunjianresolved.vue diff --git a/anrui-scm/anrui-scm-ui/src/api/kucunguanli/polling.js b/anrui-scm/anrui-scm-ui/src/api/kucunguanli/polling.js index e5b0309d27..3a6b103214 100644 --- a/anrui-scm/anrui-scm-ui/src/api/kucunguanli/polling.js +++ b/anrui-scm/anrui-scm-ui/src/api/kucunguanli/polling.js @@ -13,7 +13,16 @@ export default { // 查询分页列表(待巡检记录列表) pagelist: function(data) { return request({ - url: '/scm/v1/scmvehiclestaypatrolinspection/listPage', + url: '/scm/v1/scmvehiclepatrolinspection/stayListPage', + method: 'post', + data: data, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 查询分页列表(日常巡检报告) + baogao: function(data) { + return request({ + url: 'scm/v1/scmvehpatrolinspectionmonth/listPage', method: 'post', data: data, headers: { 'Content-Type': 'application/json' } @@ -22,11 +31,11 @@ export default { // 判断是否生成巡检记录 getInventoryRecords: function(userSid) { return request({ - url: '/scm/v1/scmvehiclestaypatrolinspection/getInspectionRecords/' + userSid, + url: '/scm/v1/scmvehpatrolinspectionmonth/getInspectionRecords/' + userSid, method: 'get' }) }, - // 巡检单点击保存 + // 巡检（新增保存或者待巡检提交） saveInspection: function(data) { return request({ url: '/scm/v1/scmvehiclepatrolinspectionsheet/saveInspection', @@ -35,7 +44,7 @@ export default { headers: { 'Content-Type': 'application/json' } }) }, - // 巡检单点击通过 + // 巡检(状态为问题未解决点击已解决或者状态为待巡检点击通过) submitInspection: function(data) { return request({ url: 'scm/v1/scmvehiclepatrolinspectionsheet/submitInspection', @@ -45,10 +54,35 @@ export default { }) }, // 通过sid查询一条记录 - fetchBySid: function(sid) { + fetchBySid: function(data) { return request({ - url: '/scm/v1/scmvehiclepatrolinspectionsheet/fetchSheetBySid/' + sid, + url: '/scm/v1/scmvehiclepatrolinspectionsheet/getInspectionInfo/' + data, + method: 'post' + }) + }, + // 新增巡检获取车架号、车型、相关负责人 + getPCInspectionVinList: function(data) { + return request({ + url: 'base/v1/basevehicle/getPCInspectionVinList', + method: 'post', + data: data, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 巡检报告(查看巡检报告) + getCarInspectionReport: function(data) { + return request({ + url: '/scm/v1/scmvehpatrolinspectionmonth/getCarInspectionReport/' + data, method: 'get' }) + }, + // 巡检报告(发送巡检报告) + sendReport: function(data) { + return request({ + url: '/scm/v1/scmvehinventoryreport/sendReport', + method: 'post', + data: data, + headers: { 'Content-Type': 'application/json' } + }) } } diff --git a/anrui-scm/anrui-scm-ui/src/components/uploadFile/upload_morebypicture.vue b/anrui-scm/anrui-scm-ui/src/components/uploadFile/upload_morebypicture.vue index cd6d09d39d..e62b85e4dc 100644 --- a/anrui-scm/anrui-scm-ui/src/components/uploadFile/upload_morebypicture.vue +++ b/anrui-scm/anrui-scm-ui/src/components/uploadFile/upload_morebypicture.vue @@ -1,6 +1,6 @@ @@ -85,6 +86,7 @@ import pageye from '@/components/pagination/pageye' import ButtonBar from '@/components/ButtonBar' import cheliangxunjianhandle from './cheliangxunjianhandle' import xunjiadanInfo from './xunjiadanInfo' +import xunjianbaogaoguanli from './relation/xunjianbaogaoguanli' import req from '@/api/kucunguanli/polling' import { fetchByUseOrgSid, getPathSidByUserSid } from '@/api/cheliang/dictcommons' @@ -95,7 +97,8 @@ export default { pageye, ButtonBar, cheliangxunjianhandle, - xunjiadanInfo + xunjiadanInfo, + xunjianbaogaoguanli }, data() { return { @@ -108,6 +111,13 @@ export default { btnKey: 'toAdd', btnLabel: '生成巡检记录' }, + { + type: 'primary', + size: 'small', + icon: '', + btnKey: 'toReport', + btnLabel: '日常巡检报告' + }, { type: 'primary', size: 'small', @@ -134,14 +144,14 @@ export default { listLoading: false, listQuery: { params: { - mainSid: '', + vinNo: '', patrolInspectionStartDate: '', patrolInspectionEndDate: '', locationSid: '', createOrgSid: '' }, current: 1, - size: 10, + size: 5, total: 0 }, rules: {} @@ -159,14 +169,14 @@ export default { getPathSidByUserSid({ userSid: window.sessionStorage.getItem('userSid') }).then((res) => { if (res.success) { this.listQuery.params.createOrgSid = res.data + fetchByUseOrgSid({ sid: this.listQuery.params.createOrgSid }).then((res) => { + if (res.success) { + this.warehouse_list = res.data + } + }) this.getList() } }) - fetchByUseOrgSid({ sid: this.listQuery.params.createOrgSid }).then((res) => { - if (res.success) { - this.warehouse_list = res.data - } - }) }, // 搜索条件效果 clicksearchShow() { @@ -183,6 +193,9 @@ export default { case 'toAdd': this.toAdd() break + case 'toReport': + this.toReport() + break case 'toEdit': this.toEdit() break @@ -226,14 +239,14 @@ export default { handleReset() { this.listQuery = { params: { - mainSid: '', + vinNo: '', patrolInspectionStartDate: '', patrolInspectionEndDate: '', locationSid: '', createOrgSid: '' }, current: 1, - size: 10, + size: 5, total: 0 } this.init() @@ -245,6 +258,10 @@ export default { } }) }, + toReport() { + this.viewState = 4 + this.$refs['divBaoGao'].init() + }, toEdit() { this.viewState = 2 this.$refs['divHandle'].showEdit(this.listQuery.params.createOrgSid) diff --git a/anrui-scm/anrui-scm-ui/src/views/kucunguanli/cheliangweihu/richangxunjian/cheliangxunjianhandle.vue b/anrui-scm/anrui-scm-ui/src/views/kucunguanli/cheliangweihu/richangxunjian/cheliangxunjianhandle.vue index b8682c5149..e50e79a3f7 100644 --- a/anrui-scm/anrui-scm-ui/src/views/kucunguanli/cheliangweihu/richangxunjian/cheliangxunjianhandle.vue +++ b/anrui-scm/anrui-scm-ui/src/views/kucunguanli/cheliangweihu/richangxunjian/cheliangxunjianhandle.vue @@ -13,7 +13,7 @@
-
车辆巡检操作
+
车辆日常管理操作
@@ -29,7 +29,7 @@
车架号:
- + @@ -41,32 +41,33 @@
库存车辆列表
+ 新增
- + - + @@ -79,6 +80,8 @@
+ + @@ -86,11 +89,15 @@ import req from '@/api/kucunguanli/polling' import { fetchByUseOrgSid } from '@/api/cheliang/dictcommons' import xunjiandan from './xunjiandan' +import daixunjian from './daixunjian' +import xunjianresolved from './xunjianresolved' export default { name: 'cheliangxunjiancaozuo', components: { - xunjiandan + xunjiandan, + daixunjian, + xunjianresolved }, data() { return { @@ -104,7 +111,7 @@ export default { listQuery: { params: { locationSid: '', - mainSid: '', + vinNo: '', createOrgSid: '' }, current: 1, @@ -153,9 +160,18 @@ export default { this.listQuery.params.locationSid = value this.getList() }, - toEdit(row) { + handleAdd() { this.viewState = 2 - this.$refs['divAdd'].showEdit(row, this.listQuery.params.createOrgSid) + this.$refs['divAdd'].showAdd(this.listQuery.params.createOrgSid) + }, + toEdit(row) { + if (row.patrolInspectionState === '待巡检') { + this.viewState = 3 + this.$refs['divDaiXunJian'].showEdit(row, this.listQuery.params.createOrgSid) + } else { + this.viewState = 4 + this.$refs['divResolved'].showEdit(row, this.listQuery.params.createOrgSid) + } }, // 返回（===既判断） handleReturn() { @@ -172,6 +188,13 @@ export default { + diff --git a/anrui-scm/anrui-scm-ui/src/views/kucunguanli/cheliangweihu/richangxunjian/relation/xunjianbaogaoAdd.vue b/anrui-scm/anrui-scm-ui/src/views/kucunguanli/cheliangweihu/richangxunjian/relation/xunjianbaogaoAdd.vue new file mode 100644 index 0000000000..130dfed68d --- /dev/null +++ b/anrui-scm/anrui-scm-ui/src/views/kucunguanli/cheliangweihu/richangxunjian/relation/xunjianbaogaoAdd.vue @@ -0,0 +1,145 @@ + + + + + diff --git a/anrui-scm/anrui-scm-ui/src/views/kucunguanli/cheliangweihu/richangxunjian/relation/xunjianbaogaoInfo.vue b/anrui-scm/anrui-scm-ui/src/views/kucunguanli/cheliangweihu/richangxunjian/relation/xunjianbaogaoInfo.vue new file mode 100644 index 0000000000..f7be2139e9 --- /dev/null +++ b/anrui-scm/anrui-scm-ui/src/views/kucunguanli/cheliangweihu/richangxunjian/relation/xunjianbaogaoInfo.vue @@ -0,0 +1,81 @@ + + + + + diff --git a/anrui-scm/anrui-scm-ui/src/views/kucunguanli/cheliangweihu/richangxunjian/relation/xunjianbaogaoguanli.vue b/anrui-scm/anrui-scm-ui/src/views/kucunguanli/cheliangweihu/richangxunjian/relation/xunjianbaogaoguanli.vue new file mode 100644 index 0000000000..86e2c902b7 --- /dev/null +++ b/anrui-scm/anrui-scm-ui/src/views/kucunguanli/cheliangweihu/richangxunjian/relation/xunjianbaogaoguanli.vue @@ -0,0 +1,245 @@ + + + + diff --git a/anrui-scm/anrui-scm-ui/src/views/kucunguanli/cheliangweihu/richangxunjian/xunjiadanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/kucunguanli/cheliangweihu/richangxunjian/xunjiadanInfo.vue index a5839f644e..4d8e09e72d 100644 --- a/anrui-scm/anrui-scm-ui/src/views/kucunguanli/cheliangweihu/richangxunjian/xunjiadanInfo.vue +++ b/anrui-scm/anrui-scm-ui/src/views/kucunguanli/cheliangweihu/richangxunjian/xunjiadanInfo.vue @@ -13,40 +13,68 @@
- - - -
车架号:
- {{ formobj.mainSid }} + + + + 车架号 - -
车型:
- {{ formobj.model }} + + {{ formobj.vinNo }} + + + 车型 + + + {{ formobj.model }} - -
巡检情况说明
- {{ formobj.situationExplain }} + + 巡检情况说明 + + + + {{ formobj.situationExplain }} + + + + + + 存在问题 + + + + {{ formobj.problems }} + - -
存在问题及处理结果
- {{ formobj.problemsAndResults }} + + 处理结果 + + + + {{ formobj.results }} + - -
相关责任人
- {{ formobj.dutyName }} + + 相关责任人 + + + + {{ formobj.liableName }} + - -
相关照片
+ + 相关照片 + + -
+
@@ -68,7 +96,7 @@ export default { name: 'cheliangxunjianInfo', data() { return { - viewTitle: '车辆巡检单详情', + viewTitle: '车辆日常巡检详情', listLoading: false, dialogVisible: false, dialogUrl: '', diff --git a/anrui-scm/anrui-scm-ui/src/views/kucunguanli/cheliangweihu/richangxunjian/xunjiandan.vue b/anrui-scm/anrui-scm-ui/src/views/kucunguanli/cheliangweihu/richangxunjian/xunjiandan.vue index 674f934b41..d021b47a1e 100644 --- a/anrui-scm/anrui-scm-ui/src/views/kucunguanli/cheliangweihu/richangxunjian/xunjiandan.vue +++ b/anrui-scm/anrui-scm-ui/src/views/kucunguanli/cheliangweihu/richangxunjian/xunjiandan.vue @@ -7,56 +7,69 @@
{{ viewTitle }}
- 保存 - 通过 + 提交 关闭
- - - -
车架号:
- {{ formobj.mainSid }} + + + + *车架号 - -
车型:
- {{ formobj.model }} + + + + + + + + + 车型 + + + {{ formobj.model }} - -
巡检情况说明
+ + 巡检情况说明 + + - + - -
存在问题及处理结果
- - + + *存在问题 + + + + - -
相关责任人
+ + 相关责任人 + + - - - + {{ formobj.liableName }} - -
相关照片
+ + *相关照片 + + - + @@ -68,8 +81,8 @@ diff --git a/anrui-scm/anrui-scm-ui/src/views/kucunguanli/cheliangweihu/richangxunjian/xunjianresolved.vue b/anrui-scm/anrui-scm-ui/src/views/kucunguanli/cheliangweihu/richangxunjian/xunjianresolved.vue new file mode 100644 index 0000000000..9891bef7c1 --- /dev/null +++ b/anrui-scm/anrui-scm-ui/src/views/kucunguanli/cheliangweihu/richangxunjian/xunjianresolved.vue @@ -0,0 +1,252 @@ + + + + + +