Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodprice/BaseModelModprice.java

@@ -0,0 +1,148 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basemodelmodprice;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * Project: anrui-base(车型调价申请) <br/>
+ * File: BaseModelModprice.java <br/>
+ * Class: com.yxt.anrui.base.api.basemodelmodprice.BaseModelModprice <br/>
+ * Description: 车型调价申请表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-15 09:11:09 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "车型调价申请表", description = "车型调价申请表")
+@TableName("base_model_modprice")
+public class BaseModelModprice extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    
+	@ApiModelProperty("申请人姓名")
+    private String applyPeoName; // 申请人姓名
+    
+	@ApiModelProperty("调价原因")
+    private String modpriceReason; // 调价原因
+    
+	@ApiModelProperty("使用组织sid")
+    private String useOrgSid; // 使用组织sid
+    
+	@ApiModelProperty("使用组织名称")
+    private String useOrgName; // 使用组织名称
+    
+	@ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+    
+	@ApiModelProperty("创建组织名称")
+    private String createOrgName; // 创建组织名称
+
+	/**
+	 * @return 申请人姓名
+	 */
+	public String getApplyPeoName(){
+		return applyPeoName;
+	}
+	
+	/**
+	 * @param applyPeoName 申请人姓名 to set
+	 */
+	public void setApplyPeoName(String applyPeoName){
+		this.applyPeoName = applyPeoName;
+	}
+	/**
+	 * @return 调价原因
+	 */
+	public String getModpriceReason(){
+		return modpriceReason;
+	}
+	
+	/**
+	 * @param modpriceReason 调价原因 to set
+	 */
+	public void setModpriceReason(String modpriceReason){
+		this.modpriceReason = modpriceReason;
+	}
+	/**
+	 * @return 使用组织sid
+	 */
+	public String getUseOrgSid(){
+		return useOrgSid;
+	}
+	
+	/**
+	 * @param useOrgSid 使用组织sid to set
+	 */
+	public void setUseOrgSid(String useOrgSid){
+		this.useOrgSid = useOrgSid;
+	}
+	/**
+	 * @return 使用组织名称
+	 */
+	public String getUseOrgName(){
+		return useOrgName;
+	}
+	
+	/**
+	 * @param useOrgName 使用组织名称 to set
+	 */
+	public void setUseOrgName(String useOrgName){
+		this.useOrgName = useOrgName;
+	}
+	/**
+	 * @return 创建组织sid
+	 */
+	public String getCreateOrgSid(){
+		return createOrgSid;
+	}
+	
+	/**
+	 * @param createOrgSid 创建组织sid to set
+	 */
+	public void setCreateOrgSid(String createOrgSid){
+		this.createOrgSid = createOrgSid;
+	}
+	/**
+	 * @return 创建组织名称
+	 */
+	public String getCreateOrgName(){
+		return createOrgName;
+	}
+	
+	/**
+	 * @param createOrgName 创建组织名称 to set
+	 */
+	public void setCreateOrgName(String createOrgName){
+		this.createOrgName = createOrgName;
+	}
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodprice/BaseModelModpriceDetailVo.java

@@ -0,0 +1,66 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basemodelmodprice;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.anrui.base.api.basemodelmodpricemodel.BaseModelModpriceModelDto;
+import com.yxt.anrui.base.api.basemodelmodpricemodel.BaseModelModpriceModelVo;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * Project: anrui-base(车型调价申请) <br/>
+ * File: BaseModelModpriceVo.java <br/>
+ * Class: com.yxt.anrui.base.api.basemodelmodprice.BaseModelModpriceVo <br/>
+ * Description: 车型调价申请表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-15 09:11:09 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "车型调价申请表 视图数据对象", description = "车型调价申请表 视图数据对象")
+@Data
+public class BaseModelModpriceDetailVo implements Vo {
+
+	@ApiModelProperty("申请日期")
+	@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+	private Date createTime; // 申请日期
+	@ApiModelProperty("申请人姓名")
+    private String applyPeoName; // 申请人姓名
+	@ApiModelProperty("调价原因")
+    private String modpriceReason; // 调价原因
+	@ApiModelProperty("调价申请车型列表")
+	private List<BaseModelModpriceModelVo> baseModelModpriceModels; // 调价申请车型列表
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodprice/BaseModelModpriceDto.java

@@ -0,0 +1,67 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basemodelmodprice;
+
+
+import com.yxt.anrui.base.api.basemodelmodpricemodel.BaseModelModpriceModelDto;
+import com.yxt.common.core.dto.Dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Project: anrui-base(车型调价申请) <br/>
+ * File: BaseModelModpriceDto.java <br/>
+ * Class: com.yxt.anrui.base.api.basemodelmodprice.BaseModelModpriceDto <br/>
+ * Description: 车型调价申请表 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-15 09:11:09 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "车型调价申请表 数据传输对象", description = "车型调价申请表 数据传输对象")
+@Data
+public class BaseModelModpriceDto implements Dto {
+
+	@ApiModelProperty("sid")
+	private String sid; // sid
+	@ApiModelProperty("申请人姓名")
+    private String applyPeoName; // 申请人姓名
+	@ApiModelProperty("调价原因")
+    private String modpriceReason; // 调价原因
+	@ApiModelProperty("使用组织sid")
+    private String useOrgSid; // 使用组织sid
+	@ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+	@ApiModelProperty("调价申请车型列表")
+	private List<BaseModelModpriceModelDto> baseModelModpriceModels; // 调价申请车型列表
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodprice/BaseModelModpriceFeign.java

@@ -0,0 +1,75 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basemodelmodprice;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * Project: anrui-base(车型调价申请) <br/>
+ * File: BaseModelModpriceFeign.java <br/>
+ * Class: com.yxt.anrui.base.api.basemodelmodprice.BaseModelModpriceFeign <br/>
+ * Description: 车型调价申请表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-15 09:11:09 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "车型调价申请表")
+@FeignClient(
+        contextId = "anrui-base-BaseModelModprice",
+        name = "anrui-base",
+        path = "v1/basemodelmodprice",
+        fallback = BaseModelModpriceFeignFallback.class)
+public interface BaseModelModpriceFeign {
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<BaseModelModpriceVo>> listPage(@RequestBody PagerQuery<BaseModelModpriceQuery> pq);
+
+    @ApiOperation("新增保存")
+    @PostMapping("/saveOrUpdate")
+    public ResultBean saveOrUpdate(@Valid @RequestBody BaseModelModpriceDto dto);
+      
+    @ApiOperation("根据sid批量删除")
+    @PostMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids);
+
+    @ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchBySid/{sid}")
+    public ResultBean<BaseModelModpriceDetailVo> fetchBySid(@PathVariable("sid") String sid);
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodprice/BaseModelModpriceFeignFallback.java

@@ -0,0 +1,72 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basemodelmodprice;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * Project: anrui-base(车型调价申请) <br/>
+ * File: BaseModelModpriceFeignFallback.java <br/>
+ * Class: com.yxt.anrui.base.api.basemodelmodprice.BaseModelModpriceFeignFallback <br/>
+ * Description: 车型调价申请表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-15 09:11:09 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class BaseModelModpriceFeignFallback implements BaseModelModpriceFeign {
+
+	@Override
+	public ResultBean<PagerVo<BaseModelModpriceVo>> listPage(PagerQuery<BaseModelModpriceQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-base/basemodelmodprice/listPage无法访问");
+	}
+
+	@Override
+	public ResultBean saveOrUpdate(BaseModelModpriceDto dto){
+		return ResultBean.fireFail().setMsg("接口anrui-base/basemodelmodprice/save无法访问");
+	}
+
+	@Override
+	public ResultBean delBySids( String[] sids){
+		return ResultBean.fireFail().setMsg("接口anrui-base/basemodelmodprice/delBySids无法访问");
+	}
+
+	@Override
+	public ResultBean<BaseModelModpriceDetailVo> fetchBySid(String sid){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-base/basemodelmodprice/fetchBySid无法访问");
+	}
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodprice/BaseModelModpriceQuery.java

@@ -0,0 +1,60 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basemodelmodprice;
+
+
+import com.yxt.common.core.query.Query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-base(车型调价申请) <br/>
+ * File: BaseModelModpriceQuery.java <br/>
+ * Class: com.yxt.anrui.base.api.basemodelmodprice.BaseModelModpriceQuery <br/>
+ * Description: 车型调价申请表 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-15 09:11:09 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "车型调价申请表 查询条件", description = "车型调价申请表 查询条件")
+@Data
+public class BaseModelModpriceQuery implements Query {
+
+	@ApiModelProperty("申请开始日期")
+	private String createStartTime; // 申请开始日期
+	@ApiModelProperty("申请结束日期")
+	private String createEndTime; // 申请结束日期
+	@ApiModelProperty("车型别名")
+	private String vehicleAlias; // 车型别名
+	@ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodprice/BaseModelModpriceVo.java

@@ -0,0 +1,67 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basemodelmodprice;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * Project: anrui-base(车型调价申请) <br/>
+ * File: BaseModelModpriceVo.java <br/>
+ * Class: com.yxt.anrui.base.api.basemodelmodprice.BaseModelModpriceVo <br/>
+ * Description: 车型调价申请表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-15 09:11:09 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "车型调价申请表 视图数据对象", description = "车型调价申请表 视图数据对象")
+@Data
+public class BaseModelModpriceVo implements Vo {
+
+	@ApiModelProperty("sid")
+	private String sid; // sid
+	@ApiModelProperty("申请日期")
+	@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+	private Date createTime; // 申请日期
+	@ApiModelProperty("申请人姓名")
+    private String applyPeoName; // 申请人姓名
+	@ApiModelProperty("车型别名")
+	private String vehicleAlias; // 车型别名
+	@ApiModelProperty("调价原因")
+    private String modpriceReason; // 调价原因
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodpricemodel/BaseModelModpriceModel.java

@@ -0,0 +1,180 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basemodelmodpricemodel;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * Project: anrui-base(车型调价申请) <br/>
+ * File: BaseModelModpriceModel.java <br/>
+ * Class: com.yxt.anrui.base.api.basemodelmodpricemodel.BaseModelModpriceModel <br/>
+ * Description: 车型调价申请车型表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-15 09:11:09 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "车型调价申请车型表", description = "车型调价申请车型表")
+@TableName("base_model_modprice_model")
+public class BaseModelModpriceModel extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    
+	@ApiModelProperty("车型调价申请sid")
+    private String mainSid; // 车型调价申请sid
+    
+	@ApiModelProperty("车型sid")
+    private String modelSid; // 车型sid
+    
+	@ApiModelProperty("车型别名")
+    private String vehicleAlias; // 车型别名
+    
+	@ApiModelProperty("常用配置sid")
+    private String configSid; // 常用配置sid
+    
+	@ApiModelProperty("常用配置名称")
+    private String configName; // 常用配置名称
+    
+	@ApiModelProperty("成本价")
+    private String costPrice; // 成本价
+    
+	@ApiModelProperty("现销售指导价")
+    private String guidedPrice; // 现销售指导价
+    
+	@ApiModelProperty("价格增减数额")
+    private String incOrDecInPrice; // 价格增减数额
+
+	/**
+	 * @return 车型调价申请sid
+	 */
+	public String getMainSid(){
+		return mainSid;
+	}
+	
+	/**
+	 * @param mainSid 车型调价申请sid to set
+	 */
+	public void setMainSid(String mainSid){
+		this.mainSid = mainSid;
+	}
+	/**
+	 * @return 车型sid
+	 */
+	public String getModelSid(){
+		return modelSid;
+	}
+	
+	/**
+	 * @param modelSid 车型sid to set
+	 */
+	public void setModelSid(String modelSid){
+		this.modelSid = modelSid;
+	}
+	/**
+	 * @return 车型别名
+	 */
+	public String getVehicleAlias(){
+		return vehicleAlias;
+	}
+	
+	/**
+	 * @param vehicleAlias 车型别名 to set
+	 */
+	public void setVehicleAlias(String vehicleAlias){
+		this.vehicleAlias = vehicleAlias;
+	}
+	/**
+	 * @return 常用配置sid
+	 */
+	public String getConfigSid(){
+		return configSid;
+	}
+	
+	/**
+	 * @param configSid 常用配置sid to set
+	 */
+	public void setConfigSid(String configSid){
+		this.configSid = configSid;
+	}
+	/**
+	 * @return 常用配置名称
+	 */
+	public String getConfigName(){
+		return configName;
+	}
+	
+	/**
+	 * @param configName 常用配置名称 to set
+	 */
+	public void setConfigName(String configName){
+		this.configName = configName;
+	}
+	/**
+	 * @return 成本价
+	 */
+	public String getCostPrice(){
+		return costPrice;
+	}
+	
+	/**
+	 * @param costPrice 成本价 to set
+	 */
+	public void setCostPrice(String costPrice){
+		this.costPrice = costPrice;
+	}
+	/**
+	 * @return 现销售指导价
+	 */
+	public String getGuidedPrice(){
+		return guidedPrice;
+	}
+	
+	/**
+	 * @param guidedPrice 现销售指导价 to set
+	 */
+	public void setGuidedPrice(String guidedPrice){
+		this.guidedPrice = guidedPrice;
+	}
+	/**
+	 * @return 价格增减数额
+	 */
+	public String getIncOrDecInPrice(){
+		return incOrDecInPrice;
+	}
+	
+	/**
+	 * @param incOrDecInPrice 价格增减数额 to set
+	 */
+	public void setIncOrDecInPrice(String incOrDecInPrice){
+		this.incOrDecInPrice = incOrDecInPrice;
+	}
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodpricemodel/BaseModelModpriceModelDto.java

@@ -0,0 +1,70 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basemodelmodpricemodel;
+
+
+import com.yxt.common.core.dto.Dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-base(车型调价申请) <br/>
+ * File: BaseModelModpriceModelDto.java <br/>
+ * Class: com.yxt.anrui.base.api.basemodelmodpricemodel.BaseModelModpriceModelDto <br/>
+ * Description: 车型调价申请车型表 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-15 09:11:09 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "车型调价申请车型表 数据传输对象", description = "车型调价申请车型表 数据传输对象")
+@Data
+public class BaseModelModpriceModelDto implements Dto {
+
+	@ApiModelProperty("车型调价申请sid")
+    private String mainSid; // 车型调价申请sid
+	@ApiModelProperty("车型sid")
+    private String modelSid; // 车型sid
+	@ApiModelProperty("车型别名")
+    private String vehicleAlias; // 车型别名
+	@ApiModelProperty("常用配置sid")
+    private String configSid; // 常用配置sid
+	@ApiModelProperty("常用配置名称")
+    private String configName; // 常用配置名称
+	@ApiModelProperty("成本价")
+    private String costPrice; // 成本价
+	@ApiModelProperty("现销售指导价")
+    private String guidedPrice; // 现销售指导价
+	@ApiModelProperty("价格增减数额")
+    private String incOrDecInPrice; // 价格增减数额
+	@ApiModelProperty("备注")
+	private String remarks; // 备注
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodpricemodel/BaseModelModpriceModelFeign.java

@@ -0,0 +1,94 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basemodelmodpricemodel;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * Project: anrui-base(车型调价申请) <br/>
+ * File: BaseModelModpriceModelFeign.java <br/>
+ * Class: com.yxt.anrui.base.api.basemodelmodpricemodel.BaseModelModpriceModelFeign <br/>
+ * Description: 车型调价申请车型表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-15 09:11:09 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "车型调价申请车型表")
+@FeignClient(
+        contextId = "anrui-base-BaseModelModpriceModel",
+        name = "anrui-base",
+        path = "basemodelmodpricemodel",
+        fallback = BaseModelModpriceModelFeignFallback.class)
+public interface BaseModelModpriceModelFeign {
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<BaseModelModpriceModelVo>> listPage(@RequestBody PagerQuery<BaseModelModpriceModelQuery> pq);
+
+    @ApiOperation("根据条件查询所有数据列表")
+    @PostMapping("/listAll")
+    public ResultBean<List<BaseModelModpriceModelVo>> listAll(@RequestBody BaseModelModpriceModelQuery query);
+
+    @ApiOperation("所有数据列表")
+    @GetMapping("/list")
+    public ResultBean<List<BaseModelModpriceModelVo>> list();
+
+    @ApiOperation("新增保存")
+    @PostMapping("/save")
+    public ResultBean save(@RequestBody BaseModelModpriceModelDto dto);
+      
+    @ApiOperation("修改保存")
+    @PostMapping("/update/{sid}")
+    public ResultBean update(@RequestBody BaseModelModpriceModelDto dto, @PathVariable("sid") String sid);
+
+    @ApiOperation("删除记录")
+    @GetMapping("/del/{ids}")
+    public ResultBean del(@PathVariable("ids") String ids);
+      
+    @ApiOperation("根据sid批量删除")
+    @PostMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids);
+
+    @ApiOperation("获取一条记录")
+    @GetMapping("/fetch/{id}")
+    public ResultBean<BaseModelModpriceModelVo> fetch(@PathVariable("id") String id);
+      
+    @ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchBySid/{sid}")
+    public ResultBean<BaseModelModpriceModelVo> fetchBySid(@PathVariable("sid") String sid);
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodpricemodel/BaseModelModpriceModelFeignFallback.java

@@ -0,0 +1,100 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basemodelmodpricemodel;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * Project: anrui-base(车型调价申请) <br/>
+ * File: BaseModelModpriceModelFeignFallback.java <br/>
+ * Class: com.yxt.anrui.base.api.basemodelmodpricemodel.BaseModelModpriceModelFeignFallback <br/>
+ * Description: 车型调价申请车型表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-15 09:11:09 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class BaseModelModpriceModelFeignFallback implements BaseModelModpriceModelFeign {
+
+	@Override
+	public ResultBean<PagerVo<BaseModelModpriceModelVo>> listPage(PagerQuery<BaseModelModpriceModelQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-base/basemodelmodpricemodel/listPage无法访问");
+	}
+
+    @Override
+    public ResultBean<List<BaseModelModpriceModelVo>> listAll(BaseModelModpriceModelQuery query){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-base/basemodelmodpricemodel/listAll无法访问");
+	}
+
+	@Override
+	public ResultBean<List<BaseModelModpriceModelVo>> list(){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-base/basemodelmodpricemodel/list无法访问");
+	}
+
+	@Override
+	public ResultBean save(BaseModelModpriceModelDto dto){
+		return ResultBean.fireFail().setMsg("接口anrui-base/basemodelmodpricemodel/save无法访问");
+	}
+
+	@Override
+	public ResultBean update(BaseModelModpriceModelDto dto, String sid){
+		return ResultBean.fireFail().setMsg("接口anrui-base/basemodelmodpricemodel/update无法访问");
+	}
+
+	@Override
+	public ResultBean del(String ids){
+		return ResultBean.fireFail().setMsg("接口anrui-base/basemodelmodpricemodel/del无法访问");
+	}
+
+	@Override
+	public ResultBean delBySids( String[] sids){
+		return ResultBean.fireFail().setMsg("接口anrui-base/basemodelmodpricemodel/delBySids无法访问");
+	}
+
+	@Override
+	public ResultBean<BaseModelModpriceModelVo> fetch(String id){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-base/basemodelmodpricemodel/fetch无法访问");
+	}
+
+	@Override
+	public ResultBean<BaseModelModpriceModelVo> fetchBySid(String sid){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-base/basemodelmodpricemodel/fetchBySid无法访问");
+	}
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodpricemodel/BaseModelModpriceModelQuery.java

@@ -0,0 +1,187 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basemodelmodpricemodel;
+
+
+import com.yxt.common.core.query.Query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * Project: anrui-base(车型调价申请) <br/>
+ * File: BaseModelModpriceModelQuery.java <br/>
+ * Class: com.yxt.anrui.base.api.basemodelmodpricemodel.BaseModelModpriceModelQuery <br/>
+ * Description: 车型调价申请车型表 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-15 09:11:09 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "车型调价申请车型表 查询条件", description = "车型调价申请车型表 查询条件")
+public class BaseModelModpriceModelQuery implements Query {
+
+    
+	@ApiModelProperty("车型调价申请sid")
+    private String mainSid; // 车型调价申请sid
+    
+	@ApiModelProperty("车型sid")
+    private String modelSid; // 车型sid
+    
+	@ApiModelProperty("车型别名")
+    private String vehicleAlias; // 车型别名
+    
+	@ApiModelProperty("常用配置sid")
+    private String configSid; // 常用配置sid
+    
+	@ApiModelProperty("常用配置名称")
+    private String configName; // 常用配置名称
+    
+	@ApiModelProperty("成本价")
+    private String costPrice; // 成本价
+    
+	@ApiModelProperty("现销售指导价")
+    private String guidedPrice; // 现销售指导价
+    
+	@ApiModelProperty("价格增减数额")
+    private String incOrDecInPrice; // 价格增减数额
+
+	
+	/**
+	 * @return 车型调价申请sid
+	 */
+	public String getMainSid(){
+		return mainSid;
+	}
+	
+	/**
+	 * @param mainSid 车型调价申请sid to set
+	 */
+	public void setMainSid(String mainSid){
+		this.mainSid = mainSid;
+	}
+	
+	/**
+	 * @return 车型sid
+	 */
+	public String getModelSid(){
+		return modelSid;
+	}
+	
+	/**
+	 * @param modelSid 车型sid to set
+	 */
+	public void setModelSid(String modelSid){
+		this.modelSid = modelSid;
+	}
+	
+	/**
+	 * @return 车型别名
+	 */
+	public String getVehicleAlias(){
+		return vehicleAlias;
+	}
+	
+	/**
+	 * @param vehicleAlias 车型别名 to set
+	 */
+	public void setVehicleAlias(String vehicleAlias){
+		this.vehicleAlias = vehicleAlias;
+	}
+	
+	/**
+	 * @return 常用配置sid
+	 */
+	public String getConfigSid(){
+		return configSid;
+	}
+	
+	/**
+	 * @param configSid 常用配置sid to set
+	 */
+	public void setConfigSid(String configSid){
+		this.configSid = configSid;
+	}
+	
+	/**
+	 * @return 常用配置名称
+	 */
+	public String getConfigName(){
+		return configName;
+	}
+	
+	/**
+	 * @param configName 常用配置名称 to set
+	 */
+	public void setConfigName(String configName){
+		this.configName = configName;
+	}
+	
+	/**
+	 * @return 成本价
+	 */
+	public String getCostPrice(){
+		return costPrice;
+	}
+	
+	/**
+	 * @param costPrice 成本价 to set
+	 */
+	public void setCostPrice(String costPrice){
+		this.costPrice = costPrice;
+	}
+	
+	/**
+	 * @return 现销售指导价
+	 */
+	public String getGuidedPrice(){
+		return guidedPrice;
+	}
+	
+	/**
+	 * @param guidedPrice 现销售指导价 to set
+	 */
+	public void setGuidedPrice(String guidedPrice){
+		this.guidedPrice = guidedPrice;
+	}
+	
+	/**
+	 * @return 价格增减数额
+	 */
+	public String getIncOrDecInPrice(){
+		return incOrDecInPrice;
+	}
+	
+	/**
+	 * @param incOrDecInPrice 价格增减数额 to set
+	 */
+	public void setIncOrDecInPrice(String incOrDecInPrice){
+		this.incOrDecInPrice = incOrDecInPrice;
+	}
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodpricemodel/BaseModelModpriceModelVo.java

@@ -0,0 +1,70 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basemodelmodpricemodel;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-base(车型调价申请) <br/>
+ * File: BaseModelModpriceModelVo.java <br/>
+ * Class: com.yxt.anrui.base.api.basemodelmodpricemodel.BaseModelModpriceModelVo <br/>
+ * Description: 车型调价申请车型表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-15 09:11:09 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "车型调价申请车型表 视图数据对象", description = "车型调价申请车型表 视图数据对象")
+@Data
+public class BaseModelModpriceModelVo implements Vo {
+
+	@ApiModelProperty("车型调价申请sid")
+    private String mainSid; // 车型调价申请sid
+	@ApiModelProperty("车型sid")
+    private String modelSid; // 车型sid
+	@ApiModelProperty("车型别名")
+    private String vehicleAlias; // 车型别名
+	@ApiModelProperty("常用配置sid")
+    private String configSid; // 常用配置sid
+	@ApiModelProperty("常用配置名称")
+    private String configName; // 常用配置名称
+	@ApiModelProperty("成本价")
+    private String costPrice; // 成本价
+	@ApiModelProperty("现销售指导价")
+    private String guidedPrice; // 现销售指导价
+	@ApiModelProperty("价格增减数额")
+    private String incOrDecInPrice; // 价格增减数额
+	@ApiModelProperty("备注")
+	private String remarks; // 备注
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigFeign.java

@@ -101,6 +101,15 @@ public interface BaseVehmodelConfigFeign {
     @GetMapping("selectOne")
     ResultBean<BaseVehmodelVo> selectOne(@RequestParam(value = "modelSid") String modelSid, @RequestParam(value = "modelConfigSid") String configSid, @RequestParam(value = "orgSid") String orgSid);
 
+    /**
+     * 根据分公司sid查询车型和常用配置关联表
+     * 排除已选择的车型与常用配置关联sid并查询其他
+     * @return
+     */
+    @ApiOperation("根据分公司sid查询车型和常用配置关联表")
+    @PostMapping("selVehModelByUseOrgSidAndModelSidAndConfigSid")
+    ResultBean<PagerVo<BaseVehmodelConfigVos>> selVehModelByUseOrgSidAndModelSidAndConfigSid(@RequestBody PagerQuery<BaseVehmodelConfigQuerys> pq);
+
     /***************************************************** App接口 **********************************************************/
 
     @ApiOperation("手机端车型库列表")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigFeignFallback.java

@@ -87,6 +87,11 @@ public class BaseVehmodelConfigFeignFallback implements BaseVehmodelConfigFeign
         return null;
     }
 
+    @Override
+    public ResultBean<PagerVo<BaseVehmodelConfigVos>> selVehModelByUseOrgSidAndModelSidAndConfigSid(PagerQuery<BaseVehmodelConfigQuerys> pq) {
+        return null;
+    }
+
     @Override
     public ResultBean<PagerVo<AppCommonlyUsedModelsByPageListVo>> getAppCommonlyUsedModelsByPageList(PagerQuery<AppCommonlyUsedModelsByPageListQuery> pagerQuery) {
         return null;

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigQuerys.java

@@ -0,0 +1,55 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basevehmodelconfig;
+
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-base(车型信息) <br/>
+ * File: BaseVehmodelConfigQuery.java <br/>
+ * Class: com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfigQuery <br/>
+ * Description: 车型与简述配置关联表 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-01-15 10:51:33 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "车型与简述配置关联表 查询条件", description = "车型与简述配置关联表 查询条件")
+@Data
+public class BaseVehmodelConfigQuerys implements Query {
+
+    @ApiModelProperty(value = "分公司sid")
+    private String useOrgSid;
+    @ApiModelProperty(value = "车型配置和常用配置")
+    private String[] sidList;
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigVos.java

@@ -0,0 +1,27 @@
+package com.yxt.anrui.base.api.basevehmodelconfig;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/4/29 10:59
+ * @Description
+ */
+@Data
+public class BaseVehmodelConfigVos implements Vo {
+    @ApiModelProperty(value = "销售指导价")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private String guidedPrice;
+    @ApiModelProperty(value = "车型别名")
+    private String vehicleAlias;
+    @ApiModelProperty(value = "车型sid")
+    private String modelSid;
+    @ApiModelProperty(value = "常用配置名称")
+    private String configName;
+    @ApiModelProperty(value = "常用配置sid")
+    private String configSid;
+}

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigRest.java

@@ -180,6 +180,7 @@ public class BaseModelConfigRest implements BaseModelConfigFeign {
         if (i3 == 0) {
             return rb.setMsg("该配置不属于当前分公司，无法修改");
         }
+        dto.setCreateOrgSId(sid1);
         String configName = "";
 //        configName += dto.getCarColor() + "/" + dto.getSpecification() + "/" + dto.getFuelTank() + "/" + dto.getBaffleModel() + "/" + dto.getIndependentSources() + "/" + dto.getTireCover() + "/" + dto.getSaddle() + "/" + dto.getAirConditioner() + "/" + dto.getRearAxleRatio() + "/" + dto.getTireSize() + "/" + dto.getSlowMachine() + "/" + dto.getRearViewMirror() + "/" + dto.getWheelbase() + "/" + dto.getSuspension() + "/" + dto.getPackingCase() + "/" + dto.getSeat() + "/" + dto.getHubMaterial() + "/" + dto.getConfiguringBao() + "/" + dto.getMultimedia() + "/" + dto.getBumper();
         //缓速器

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceMapper.java

@@ -0,0 +1,65 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.biz.basemodelmodprice;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import com.yxt.anrui.base.api.basemodelmodprice.BaseModelModprice;
+import com.yxt.anrui.base.api.basemodelmodprice.BaseModelModpriceVo;
+
+import java.util.List;
+
+/**
+ * Project: anrui-base(车型调价申请) <br/>
+ * File: BaseModelModpriceMapper.java <br/>
+ * Class: com.yxt.anrui.base.biz.basemodelmodprice.BaseModelModpriceMapper <br/>
+ * Description: 车型调价申请表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-15 09:11:09 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface BaseModelModpriceMapper extends BaseMapper<BaseModelModprice> {
+
+	//@Update("update base_model_modprice set name=#{msg} where id=#{id}")
+	//IPage<BaseModelModpriceVo> voPage(IPage<BaseModelModprice> page, @Param(Constants.WRAPPER) QueryWrapper<BaseModelModprice> qw);
+	
+	IPage<BaseModelModpriceVo> selectPageVo(IPage<BaseModelModprice> page, @Param(Constants.WRAPPER) Wrapper<BaseModelModprice> qw);
+	
+	List<BaseModelModpriceVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BaseModelModprice> qw);
+	
+	@Select("select * from base_model_modprice")
+	List<BaseModelModpriceVo> selectListVo();
+}

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceMapper.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.anrui.base.biz.basemodelmodprice.BaseModelModpriceMapper">
+<!--    <where> ${ew.sqlSegment} </where>-->
+<!--    ${ew.customSqlSegment} -->
+	<select id="selectPageVo" resultType="com.yxt.anrui.base.api.basemodelmodprice.BaseModelModpriceVo">
+		SELECT
+		bmm.sid,
+		bmm.createTime,
+		bmm.applyPeoName,
+		bmmm.`vehicleAlias`,
+		bmm.`modpriceReason`
+		FROM
+		base_model_modprice bmm
+		LEFT JOIN base_model_modprice_model bmmm
+		ON bmm.`sid` = bmmm.`mainSid`  <where> ${ew.sqlSegment} </where>
+	</select>
+	
+	<select id="selectListAllVo" resultType="com.yxt.anrui.base.api.basemodelmodprice.BaseModelModpriceVo">
+		SELECT * FROM base_model_modprice <where> ${ew.sqlSegment} </where>
+	</select>
+</mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceRest.java

@@ -0,0 +1,89 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.biz.basemodelmodprice;
+
+import com.yxt.anrui.base.api.basemodelmodprice.*;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * Project: anrui-base(车型调价申请) <br/>
+ * File: BaseModelModpriceFeignFallback.java <br/>
+ * Class: com.yxt.anrui.base.biz.basemodelmodprice.BaseModelModpriceRest <br/>
+ * Description: 车型调价申请表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-15 09:11:09 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "车型调价申请表")
+@RestController("com.yxt.anrui.base.biz.basemodelmodprice.BaseModelModpriceRest")
+@RequestMapping("v1/basemodelmodprice")
+public class BaseModelModpriceRest implements BaseModelModpriceFeign {
+
+	@Autowired
+	private BaseModelModpriceService baseModelModpriceService;
+
+	@Override
+	@ApiOperation("根据条件分页查询数据的列表")
+	@PostMapping("/listPage")
+	public ResultBean<PagerVo<BaseModelModpriceVo>> listPage(@RequestBody PagerQuery<BaseModelModpriceQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		PagerVo<BaseModelModpriceVo> pv = baseModelModpriceService.listPageVo(pq);
+		return rb.success().setData(pv);
+	}
+
+	@Override
+	@ApiOperation("新增修改保存")
+	@PostMapping("/saveOrUpdate")
+	public ResultBean saveOrUpdate(@RequestBody BaseModelModpriceDto dto){
+		return baseModelModpriceService.saveOrUpdateAll(dto);
+	}
+
+	@Override
+	@ApiOperation("根据sid批量删除")
+    @PostMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids){
+		return baseModelModpriceService.delAll(sids);
+	}
+
+	@Override
+	@ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchBySid/{sid}")
+    public ResultBean<BaseModelModpriceDetailVo> fetchBySid(@PathVariable("sid") String sid){
+		return baseModelModpriceService.fetchAll(sid);
+	}
+}

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java

@@ -0,0 +1,137 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.biz.basemodelmodprice;
+
+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.base.api.basemodelmodprice.*;
+import com.yxt.anrui.base.api.basemodelmodpricemodel.BaseModelModpriceModel;
+import com.yxt.anrui.base.api.basemodelmodpricemodel.BaseModelModpriceModelDto;
+import com.yxt.anrui.base.api.basemodelmodpricemodel.BaseModelModpriceModelVo;
+import com.yxt.anrui.base.biz.basemodelmodpricemodel.BaseModelModpriceModelService;
+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.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Project: anrui-base(车型调价申请) <br/>
+ * File: BaseModelModpriceService.java <br/>
+ * Class: com.yxt.anrui.base.biz.basemodelmodprice.BaseModelModpriceService <br/>
+ * Description: 车型调价申请表 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-15 09:11:09 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class BaseModelModpriceService extends MybatisBaseService<BaseModelModpriceMapper, BaseModelModprice> {
+
+    @Autowired
+    private BaseModelModpriceModelService baseModelModpriceModelService;
+
+    public PagerVo<BaseModelModpriceVo> listPageVo(PagerQuery<BaseModelModpriceQuery> pq) {
+        BaseModelModpriceQuery query = pq.getParams();
+        QueryWrapper<BaseModelModprice> qw = new QueryWrapper<>();
+        String createStartTime = query.getCreateStartTime();
+        String createEndTime = query.getCreateEndTime();
+        qw.apply(StringUtils.isNotEmpty(createStartTime), "date_format (bmm.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
+                apply(StringUtils.isNotEmpty(createEndTime), "date_format (bmm.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
+                );
+        qw.eq("bmm.createOrgSid", query.getCreateOrgSid());
+        qw.eq("bmm.isDelete", 0);
+        if (StringUtils.isNotBlank(query.getVehicleAlias())) {
+            qw.like("bmmm.vehicleAlias", query.getVehicleAlias());
+        }
+        IPage<BaseModelModprice> page = PagerUtil.queryToPage(pq);
+        IPage<BaseModelModpriceVo> pagging = baseMapper.selectPageVo(page, qw);
+        PagerVo<BaseModelModpriceVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+    public ResultBean saveOrUpdateAll(BaseModelModpriceDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        String sid = dto.getSid();
+        List<BaseModelModpriceModelDto> baseModelModpriceModels = dto.getBaseModelModpriceModels();
+        if (StringUtils.isBlank(sid)){//新增
+            BaseModelModprice baseModelModprice = new BaseModelModprice();
+            String sid1 = baseModelModprice.getSid();
+            BeanUtil.copyProperties(dto, baseModelModprice);
+            baseModelModprice.setSid(sid1);
+            save(baseModelModprice);
+            for (BaseModelModpriceModelDto modelModpriceModel : baseModelModpriceModels) {
+                BaseModelModpriceModel baseModelModpriceModel = new BaseModelModpriceModel();
+                BeanUtil.copyProperties(modelModpriceModel, baseModelModpriceModel);
+                baseModelModpriceModel.setMainSid(sid1);
+                baseModelModpriceModelService.save(baseModelModpriceModel);
+            }
+            return rb.success().setMsg("保存成功");
+        }
+        BaseModelModprice baseModelModprice = fetchBySid(sid);
+        if (baseModelModprice == null){
+            return rb.setMsg("该车型调价单不存在");
+        }
+        updateBySid(dto.toMap(), sid);
+        baseModelModpriceModelService.delByMainSid(sid);
+        for (BaseModelModpriceModelDto modelModpriceModel : baseModelModpriceModels) {
+            BaseModelModpriceModel baseModelModpriceModel = new BaseModelModpriceModel();
+            BeanUtil.copyProperties(modelModpriceModel, baseModelModpriceModel);
+            baseModelModpriceModel.setMainSid(sid);
+            baseModelModpriceModelService.save(baseModelModpriceModel);
+        }
+        return rb.success().setMsg("修改成功");
+    }
+
+    public ResultBean<BaseModelModpriceDetailVo> fetchAll(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        BaseModelModpriceDetailVo baseModelModpriceDetailVo = new BaseModelModpriceDetailVo();
+        BaseModelModprice baseModelModprice = fetchBySid(sid);
+        BeanUtil.copyProperties(baseModelModprice, baseModelModpriceDetailVo);
+        List<BaseModelModpriceModelVo> baseModelModpriceModelVos = baseModelModpriceModelService.fetchByMainSid(sid);
+        baseModelModpriceDetailVo.setBaseModelModpriceModels(baseModelModpriceModelVos);
+        return rb.success().setData(baseModelModpriceDetailVo);
+    }
+
+    public ResultBean delAll(String[] sids) {
+        ResultBean rb = ResultBean.fireFail();
+        delBySids(sids);
+        for (String sid : sids) {
+            baseModelModpriceModelService.delByMainSid(sid);
+        }
+        return rb.success().setMsg("删除成功");
+    }
+}

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodpricemodel/BaseModelModpriceModelMapper.java

@@ -0,0 +1,72 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.biz.basemodelmodpricemodel;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import com.yxt.anrui.base.api.basemodelmodpricemodel.BaseModelModpriceModel;
+import com.yxt.anrui.base.api.basemodelmodpricemodel.BaseModelModpriceModelVo;
+
+import java.util.List;
+
+/**
+ * Project: anrui-base(车型调价申请) <br/>
+ * File: BaseModelModpriceModelMapper.java <br/>
+ * Class: com.yxt.anrui.base.biz.basemodelmodpricemodel.BaseModelModpriceModelMapper <br/>
+ * Description: 车型调价申请车型表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-15 09:11:09 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface BaseModelModpriceModelMapper extends BaseMapper<BaseModelModpriceModel> {
+
+	//@Update("update base_model_modprice_model set name=#{msg} where id=#{id}")
+	//IPage<BaseModelModpriceModelVo> voPage(IPage<BaseModelModpriceModel> page, @Param(Constants.WRAPPER) QueryWrapper<BaseModelModpriceModel> qw);
+	
+	IPage<BaseModelModpriceModelVo> selectPageVo(IPage<BaseModelModpriceModel> page, @Param(Constants.WRAPPER) Wrapper<BaseModelModpriceModel> qw);
+	
+	List<BaseModelModpriceModelVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BaseModelModpriceModel> qw);
+	
+	@Select("select * from base_model_modprice_model")
+	List<BaseModelModpriceModelVo> selectListVo();
+
+	@Select("select * from base_model_modprice_model where mainSid = #{sid}")
+    List<BaseModelModpriceModelVo> fetchByMainSid(String sid);
+
+	@Delete("delete from base_model_modprice_model where mainSid = #{sid}")
+	int delByMainSid(String sid);
+}

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodpricemodel/BaseModelModpriceModelMapper.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.anrui.base.biz.basemodelmodpricemodel.BaseModelModpriceModelMapper">
+<!--    <where> ${ew.sqlSegment} </where>-->
+<!--    ${ew.customSqlSegment} -->
+	<select id="selectPageVo" resultType="com.yxt.anrui.base.api.basemodelmodpricemodel.BaseModelModpriceModelVo">
+		SELECT * FROM base_model_modprice_model <where> ${ew.sqlSegment} </where>
+	</select>
+	
+	<select id="selectListAllVo" resultType="com.yxt.anrui.base.api.basemodelmodpricemodel.BaseModelModpriceModelVo">
+		SELECT * FROM base_model_modprice_model <where> ${ew.sqlSegment} </where>
+	</select>
+</mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodpricemodel/BaseModelModpriceModelRest.java

@@ -0,0 +1,144 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.biz.basemodelmodpricemodel;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import com.yxt.anrui.base.api.basemodelmodpricemodel.BaseModelModpriceModel;
+import com.yxt.anrui.base.api.basemodelmodpricemodel.BaseModelModpriceModelQuery;
+import com.yxt.anrui.base.api.basemodelmodpricemodel.BaseModelModpriceModelVo;
+import com.yxt.anrui.base.api.basemodelmodpricemodel.BaseModelModpriceModelDto;
+import com.yxt.anrui.base.api.basemodelmodpricemodel.BaseModelModpriceModelFeign;
+
+/**
+ * Project: anrui-base(车型调价申请) <br/>
+ * File: BaseModelModpriceModelFeignFallback.java <br/>
+ * Class: com.yxt.anrui.base.biz.basemodelmodpricemodel.BaseModelModpriceModelRest <br/>
+ * Description: 车型调价申请车型表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-15 09:11:09 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "车型调价申请车型表")
+@RestController("com.yxt.anrui.base.biz.basemodelmodpricemodel.BaseModelModpriceModelRest")
+@RequestMapping("/basemodelmodpricemodel")
+public class BaseModelModpriceModelRest implements BaseModelModpriceModelFeign {
+
+	@Autowired
+	private BaseModelModpriceModelService baseModelModpriceModelService;
+
+	@Override
+	@ApiOperation("根据条件分页查询数据的列表")
+	@PostMapping("/listPage")
+	public ResultBean<PagerVo<BaseModelModpriceModelVo>> listPage(@RequestBody PagerQuery<BaseModelModpriceModelQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		PagerVo<BaseModelModpriceModelVo> pv = baseModelModpriceModelService.listPageVo(pq);
+		return rb.success().setData(pv);
+	}
+
+	@Override
+	@ApiOperation("根据条件查询所有数据列表")
+	@PostMapping("/listAll")
+	public ResultBean<List<BaseModelModpriceModelVo>> listAll(@RequestBody BaseModelModpriceModelQuery query){
+		ResultBean rb = ResultBean.fireFail();
+		List<BaseModelModpriceModelVo> list = baseModelModpriceModelService.listAllVo(query);
+		return rb.success().setData(list);
+	}
+
+	@Override
+	@ApiOperation("所有数据列表")
+	@GetMapping("/list")
+	public ResultBean<List<BaseModelModpriceModelVo>> list(){
+		ResultBean rb = ResultBean.fireFail();
+		List<BaseModelModpriceModelVo> list = baseModelModpriceModelService.listVo();
+		return rb.success().setData(list);
+	}
+
+	@Override
+	@ApiOperation("新增保存")
+	@PostMapping("/save")
+	public ResultBean save(@RequestBody BaseModelModpriceModelDto dto){
+		ResultBean rb = ResultBean.fireFail();
+		baseModelModpriceModelService.saveOrUpdateDto(dto);
+		return rb.success();
+	}
+
+	@Override
+	@ApiOperation("修改保存")
+	@PostMapping("/update/{sid}")
+	public ResultBean update(@RequestBody BaseModelModpriceModelDto dto, @PathVariable("sid") String sid){
+		ResultBean rb = ResultBean.fireFail();
+		baseModelModpriceModelService.updateBySid(dto.toMap(),sid);
+		return rb.success();
+	}
+
+	@Override
+	@ApiOperation("删除记录")
+	@GetMapping("/del/{ids}")
+	public ResultBean del(@PathVariable("ids") String ids){
+		ResultBean rb = ResultBean.fireFail();
+		baseModelModpriceModelService.delByIds(ids);
+		return rb.success();
+	}
+
+	@Override
+	@ApiOperation("根据sid批量删除")
+    @PostMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids){
+		ResultBean rb = ResultBean.fireFail();
+		baseModelModpriceModelService.delBySids(sids);
+		return rb.success();
+	}
+
+	@Override
+	@ApiOperation("获取一条记录")
+	@GetMapping("/fetch/{id}")
+	public ResultBean<BaseModelModpriceModelVo> fetch(@PathVariable("id") String id){
+		ResultBean rb = ResultBean.fireFail();
+		BaseModelModpriceModelVo vo = baseModelModpriceModelService.fetchByIdVo(id);
+		return rb.success().setData(vo);
+	}
+
+	@Override
+	@ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchBySid/{sid}")
+    public ResultBean<BaseModelModpriceModelVo> fetchBySid(@PathVariable("sid") String sid){
+		ResultBean rb = ResultBean.fireFail();
+		BaseModelModpriceModelVo vo = null;
+		return rb.success().setData(vo);
+	}
+}

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodpricemodel/BaseModelModpriceModelService.java

@@ -0,0 +1,152 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.biz.basemodelmodpricemodel;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+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.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.anrui.base.api.basemodelmodpricemodel.BaseModelModpriceModel;
+import com.yxt.anrui.base.api.basemodelmodpricemodel.BaseModelModpriceModelQuery;
+import com.yxt.anrui.base.api.basemodelmodpricemodel.BaseModelModpriceModelVo;
+import com.yxt.anrui.base.api.basemodelmodpricemodel.BaseModelModpriceModelDto;
+import com.yxt.anrui.base.api.basemodelmodpricemodel.BaseModelModpriceModelFeign;
+
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Project: anrui-base(车型调价申请) <br/>
+ * File: BaseModelModpriceModelService.java <br/>
+ * Class: com.yxt.anrui.base.biz.basemodelmodpricemodel.BaseModelModpriceModelService <br/>
+ * Description: 车型调价申请车型表 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-15 09:11:09 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class BaseModelModpriceModelService extends MybatisBaseService<BaseModelModpriceModelMapper, BaseModelModpriceModel> {
+	public PagerVo<BaseModelModpriceModel> listPage(PagerQuery<BaseModelModpriceModelQuery> pq) {
+		BaseModelModpriceModelQuery query = pq.getParams();
+		QueryWrapper<BaseModelModpriceModel> qw = createQueryWrapper(query);
+		IPage<BaseModelModpriceModel> page = PagerUtil.queryToPage(pq);
+		IPage<BaseModelModpriceModel> pagging = baseMapper.selectPage(page, qw);
+		PagerVo<BaseModelModpriceModel> p = PagerUtil.pageToVo(pagging, null);
+		return p;
+	}
+	public List<BaseModelModpriceModel> listAll(BaseModelModpriceModelQuery query) {
+		QueryWrapper<BaseModelModpriceModel> qw = createQueryWrapper(query);
+		return baseMapper.selectList(qw);
+	}
+	private QueryWrapper<BaseModelModpriceModel> createQueryWrapper(BaseModelModpriceModelQuery query) {
+		// todo: 这里根据具体业务调整查询条件
+		// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+		QueryWrapper<BaseModelModpriceModel> qw = new QueryWrapper<>();
+
+
+		if (StringUtils.isNotBlank(query.getMainSid())) {
+			qw.eq("mainSid", query.getMainSid());
+		}
+
+		if (StringUtils.isNotBlank(query.getModelSid())) {
+			qw.eq("modelSid", query.getModelSid());
+		}
+
+		if (StringUtils.isNotBlank(query.getVehicleAlias())) {
+			qw.eq("vehicleAlias", query.getVehicleAlias());
+		}
+
+		if (StringUtils.isNotBlank(query.getConfigSid())) {
+			qw.eq("configSid", query.getConfigSid());
+		}
+
+		if (StringUtils.isNotBlank(query.getConfigName())) {
+			qw.eq("configName", query.getConfigName());
+		}
+
+		if (StringUtils.isNotBlank(query.getCostPrice())) {
+			qw.eq("costPrice", query.getCostPrice());
+		}
+
+		if (StringUtils.isNotBlank(query.getGuidedPrice())) {
+			qw.eq("guidedPrice", query.getGuidedPrice());
+		}
+
+		if (StringUtils.isNotBlank(query.getIncOrDecInPrice())) {
+			qw.eq("incOrDecInPrice", query.getIncOrDecInPrice());
+		}
+		return qw;
+	}
+	
+	public PagerVo<BaseModelModpriceModelVo> listPageVo(PagerQuery<BaseModelModpriceModelQuery> pq) {
+		BaseModelModpriceModelQuery query = pq.getParams();
+		QueryWrapper<BaseModelModpriceModel> qw = createQueryWrapper(query);
+		IPage<BaseModelModpriceModel> page = PagerUtil.queryToPage(pq);
+		IPage<BaseModelModpriceModelVo> pagging = baseMapper.selectPageVo(page, qw);
+		PagerVo<BaseModelModpriceModelVo> p = PagerUtil.pageToVo(pagging, null);
+		return p;
+	}
+	
+	public List<BaseModelModpriceModelVo> listAllVo(BaseModelModpriceModelQuery query) {
+		QueryWrapper<BaseModelModpriceModel> qw = createQueryWrapper(query);
+		return baseMapper.selectListAllVo(qw);
+	}
+	
+	public List<BaseModelModpriceModelVo> listVo() {
+		return baseMapper.selectListVo();
+	}
+	
+	public void saveOrUpdateDto(BaseModelModpriceModelDto dto){
+		BaseModelModpriceModel entity = new BaseModelModpriceModel();
+		dto.fillEntity(entity);
+		this.saveOrUpdate(entity);
+	}
+	
+	public BaseModelModpriceModelVo fetchByIdVo(String id){
+		BaseModelModpriceModel entity = this.fetchById(id);
+		BaseModelModpriceModelVo vo = new BaseModelModpriceModelVo();
+		BeanUtil.copyProperties(entity, vo);
+		return vo;
+	}
+
+    public List<BaseModelModpriceModelVo> fetchByMainSid(String sid) {
+		return baseMapper.fetchByMainSid(sid);
+    }
+
+	public int delByMainSid(String sid) {
+		return baseMapper.delByMainSid(sid);
+	}
+}

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.java

@@ -130,4 +130,6 @@ public interface BaseVehmodelConfigMapper extends BaseMapper<BaseVehmodelConfig>
     int checkByModelSid(String sid);
 
     List<BaseVehmodelConfigVo> getListByConfigSidAndUseOrgSid(@Param("configSid") String configSid, @Param("createOrgSId") String createOrgSId);
+
+    IPage<BaseVehmodelConfigVos> selVehModelByUseOrgSidAndModelSidAndConfigSid(IPage<BaseVehmodelConfig> page,@Param(Constants.WRAPPER) QueryWrapper<BaseVehmodelConfigVos> qw);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml

@@ -5,9 +5,9 @@
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfigVo">
         SELECT bvc.*,
-               bvm.modelName,
-               bvm.`vehicleVersionValue`,
-               bvm.`vehicleTypeCode`,
+        bvm.modelName,
+        bvm.`vehicleVersionValue`,
+        bvm.`vehicleTypeCode`,
         <!--车身颜色-->
         bmc.carColor,
         <!--驾驶室规格-->
@@ -53,10 +53,10 @@
         bmc.configName,
         bvm.insideCode
         FROM base_vehmodel_config bvc
-                 LEFT JOIN base_vehicle_model bvm
-                           ON bvc.modelSid = bvm.sid
-                 LEFT JOIN base_model_config bmc
-                           ON bvc.configurationItemsSid = bmc.sid
+        LEFT JOIN base_vehicle_model bvm
+        ON bvc.modelSid = bvm.sid
+        LEFT JOIN base_model_config bmc
+        ON bvc.configurationItemsSid = bmc.sid
         <where>
             ${ew.sqlSegment}
         </where>
@@ -73,14 +73,14 @@
     <select id="getAppCommonlyUsedModelsByPageList"
             resultType="com.yxt.anrui.base.api.basevehmodelconfig.AppCommonlyUsedModelsByPageListVo">
         SELECT bvm.sid AS modelSid,
-               bvm.vehicleAlias,
-               bvm.brandName,
-               bvm.vehicleVersionValue,
-               bvm.fuelTypeValue,
-               bvm.gearboxTypeValue
+        bvm.vehicleAlias,
+        bvm.brandName,
+        bvm.vehicleVersionValue,
+        bvm.fuelTypeValue,
+        bvm.gearboxTypeValue
         FROM base_vehmodel_config bvc
-                 LEFT JOIN base_vehicle_model bvm ON bvc.modelSid = bvm.sid
-                 LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid
+        LEFT JOIN base_vehicle_model bvm ON bvc.modelSid = bvm.sid
+        LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid
         <where>
             ${ew.sqlSegment}
         </where>
@@ -109,8 +109,8 @@
                bmc.brandName,
                bvc.guidedPrice
         FROM base_vehmodel_config bvc
-                 LEFT JOIN base_vehicle_model bvm ON bvc.modelSid = bvm.sid
-                 LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid
+                     LEFT JOIN base_vehicle_model bvm ON bvc.modelSid = bvm.sid
+                     LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid
         WHERE bvm.sid = #{modelSid}
         GROUP BY bvm.sid
     </select>
@@ -126,7 +126,7 @@
     <select id="getConfigNumByModelSid" resultType="java.lang.String">
         SELECT count(*)
         FROM base_vehmodel_config bvc
-                 LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid
+                     LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid
         WHERE bvc.modelSid = #{modelSid}
     </select>
 
@@ -170,8 +170,8 @@
                bmc.configuringBao,
                bmc.otherConfig
         FROM base_vehmodel_config bvc
-                 LEFT JOIN base_vehicle_model bvm ON bvc.`modelSid` = bvm.`sid`
-                 LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.`sid`
+                     LEFT JOIN base_vehicle_model bvm ON bvc.`modelSid` = bvm.`sid`
+                     LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.`sid`
         WHERE bvm.sid = #{modelSid}
           AND bmc.sid = #{configSid}
     </select>
@@ -191,8 +191,8 @@
                bvm.carBrand     AS brandSid,
                bvc.guidedPrice  AS saleReferencePrice
         FROM base_vehmodel_config bvc
-                 LEFT JOIN base_vehicle_model bvm ON bvc.modelSid = bvm.sid
-                 LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid
+                     LEFT JOIN base_vehicle_model bvm ON bvc.modelSid = bvm.sid
+                     LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid
         WHERE bvc.modelSid = #{modelSid}
           AND bvc.configurationItemsSid = #{configSid}
           AND bvc.useOrgSid = #{useOrg}
@@ -205,16 +205,16 @@
                bvc.`manufactorSettlementPrice`,
                bvc.`guidedPrice`
         FROM base_vehmodel_config bvc
-                 LEFT JOIN base_vehicle_model bvm ON bvc.`modelSid` = bvm.`sid`
-                 LEFT JOIN base_model_config bmc ON bvc.`configurationItemsSid` = bmc.`sid`
+                     LEFT JOIN base_vehicle_model bvm ON bvc.`modelSid` = bvm.`sid`
+                     LEFT JOIN base_model_config bmc ON bvc.`configurationItemsSid` = bmc.`sid`
         WHERE bvc.sid = #{sid}
     </select>
 
     <select id="selectO" resultType="com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelVo">
         select bvc.guidedPrice, bm.modelName, bmc.otherConfig, bm.carBrand as brandSid
         from base_vehmodel_config bvc
-                 left join base_vehicle_model bm on bvc.modelSid = bm.sid
-                 left join base_model_config bmc on bvc.configurationItemsSid = bmc.sid
+                     left join base_vehicle_model bm on bvc.modelSid = bm.sid
+                     left join base_model_config bmc on bvc.configurationItemsSid = bmc.sid
         where bvc.modelSid = #{modelSid}
           and bvc.configurationItemsSid = #{configSid}
           and bvc.useOrgSid = #{orgSid}
@@ -248,8 +248,8 @@
                bvc.guidedPrice  as price,
                bmc.otherConfig
         FROM base_vehmodel_config bvc
-                 LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid
-                 LEFT JOIN base_vehicle_model bvm ON bvc.modelSid = bvm.sid
+                     LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid
+                     LEFT JOIN base_vehicle_model bvm ON bvc.modelSid = bvm.sid
         WHERE bvc.modelSid = #{modelSid}
           AND bvc.configurationItemsSid = #{configSid}
           AND bvc.useOrgSid = #{useOrgSid}
@@ -289,4 +289,25 @@
         WHERE configurationItemsSid = #{configSid}
           AND useOrgSid = #{createOrgSId}
     </select>
+
+    <select id="selVehModelByUseOrgSidAndModelSidAndConfigSid"
+            resultType="com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfigVos">
+        SELECT
+        bvm.`vehicleAlias`,
+        bvm.sid as modelSid,
+        bmc.`configName`,
+        bmc.sid as configSid,
+        bvc.`guidedPrice`
+        FROM
+        base_vehmodel_config bvc
+        LEFT JOIN base_vehicle_model bvm
+        ON bvc.`modelSid` = bvm.`sid`
+        LEFT JOIN base_model_config bmc
+        ON bvc.`configurationItemsSid` = bmc.`sid`
+        LEFT JOIN base_vehicle bv
+        ON bvc.`modelSid` = bv.`modelSid`
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigRest.java

@@ -119,6 +119,13 @@ public class BaseVehmodelConfigRest implements BaseVehmodelConfigFeign {
         return baseVehmodelConfigService.selectOne(modelSid, configSid,orgSid);
     }
 
+    @Override
+    public ResultBean<PagerVo<BaseVehmodelConfigVos>> selVehModelByUseOrgSidAndModelSidAndConfigSid(PagerQuery<BaseVehmodelConfigQuerys> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<BaseVehmodelConfigVos> pv = baseVehmodelConfigService.selVehModelByUseOrgSidAndModelSidAndConfigSid(pq);
+        return rb.success().setData(pv);
+    }
+
     /**
      * 手机端车型库列表
      *

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java

@@ -48,6 +48,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
@@ -568,4 +569,21 @@ public class BaseVehmodelConfigService extends MybatisBaseService<BaseVehmodelCo
     public List<BaseVehmodelConfigVo> getListByConfigSidAndUseOrgSid(String configSid, String createOrgSId) {
         return baseMapper.getListByConfigSidAndUseOrgSid(configSid, createOrgSId);
     }
+
+    public PagerVo<BaseVehmodelConfigVos> selVehModelByUseOrgSidAndModelSidAndConfigSid(PagerQuery<BaseVehmodelConfigQuerys> pq) {
+        BaseVehmodelConfigQuerys query = pq.getParams();
+        QueryWrapper<BaseVehmodelConfigVos> qw = new QueryWrapper<>();
+        qw.eq("bvc.useOrgSid",query.getUseOrgSid());
+        qw.eq("bv.createOrg",query.getUseOrgSid());
+        qw.eq("bv.vehicleStateValue","库存");
+        String[] sidList = query.getSidList();
+        if (sidList.length > 0){
+            List<String> stringList = Arrays.asList(sidList);
+            qw.ne("bvc.modelSid",stringList.get(0)).ne("bvc.configurationItemsSid",stringList.get(1));
+        }
+        IPage<BaseVehmodelConfig> page = PagerUtil.queryToPage(pq);
+        IPage<BaseVehmodelConfigVos> pagging = baseMapper.selVehModelByUseOrgSidAndModelSidAndConfigSid(page, qw);
+        PagerVo<BaseVehmodelConfigVos> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmenu/SysMenuRest.java

@@ -97,7 +97,8 @@ public class SysMenuRest implements SysMenuFeign {
             Integer type = sysRoleService.fetchBySid(roleSid).getType();
             if (type == 1){
                 orgRoleMenuQuery.setIsAdmin("1");
-                break;
+            }else {
+                orgRoleMenuQuery.setIsAdmin("0");
             }
         }
         orgRoleMenuQuery.setRoleSids(roleSids);

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmenurole/SysMenuRoleService.java

@@ -131,8 +131,10 @@ public class SysMenuRoleService extends MybatisBaseService<SysMenuRoleMapper, Sy
 			/*if (org.apache.commons.lang3.StringUtils.isNotBlank(query.getRoleSid())) {
 				qw.in("rm.roleSid", query.getRoleSid());
 			}*/
-            if (StringUtils.isBlank(query.getIsAdmin())) {
-                qw.eq("m.isEnable", 1);
+            if (StringUtils.isNotBlank(query.getIsAdmin())) {
+                if (!query.getIsAdmin().equals("1")){
+                    qw.eq("m.isEnable", 1);
+                }
             }
 
             if (query.getRoleSids() != null && query.getRoleSids().size() > 0) {

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.portal.api.sysorganization.AppContactSysOrganizationVo;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganization;
+import com.yxt.anrui.portal.api.sysrole.SysRole;
+import com.yxt.anrui.portal.api.sysrole.SysRoleVo;
 import com.yxt.anrui.portal.api.sysstaffinfo.*;
 import com.yxt.anrui.portal.api.sysstaffinfo.app.AppSysStaffQuery;
 import com.yxt.anrui.portal.api.sysstaffinfo.app.AppSysStaffVo;
@@ -15,11 +17,14 @@ import com.yxt.anrui.portal.api.sysstaffpost.SysStaffPost;
 import com.yxt.anrui.portal.api.sysstaffpost.SysStaffPostDetailsVo;
 import com.yxt.anrui.portal.api.sysstaffpost.SysStaffPostDto;
 import com.yxt.anrui.portal.api.sysuser.SysUser;
+import com.yxt.anrui.portal.api.sysuserrole.SysUserRole;
 import com.yxt.anrui.portal.biz.sysorganization.SysOrganizationService;
 import com.yxt.anrui.portal.biz.syspost.SysPostService;
+import com.yxt.anrui.portal.biz.sysrole.SysRoleService;
 import com.yxt.anrui.portal.biz.sysstafforg.SysStaffOrgService;
 import com.yxt.anrui.portal.biz.sysstaffpost.SysStaffPostService;
 import com.yxt.anrui.portal.biz.sysuser.SysUserService;
+import com.yxt.anrui.portal.biz.sysuserrole.SysUserRoleService;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.Encodes;
@@ -64,6 +69,10 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
     private SysPostService sysPostService;
     @Autowired
     private SysOrganizationService sysOrganizationService;
+    @Autowired
+    private SysUserRoleService sysUserRoleService;
+    @Autowired
+    private SysRoleService sysRoleService;
 
     public List<SysStaffinfoAppContactsVo> selectAppContactsList() {
         List<SysStaffinfoAppContactsVo> list = baseMapper.selectAppContactsList();
@@ -200,6 +209,10 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
      */
     public ResultBean saveStaffInfo(SysStaffinfoDto dto) {
         ResultBean rb = ResultBean.fireFail();
+        SysRoleVo sysRoleVo = sysRoleService.fetchByName("试用期员工");
+        if (sysRoleVo == null){
+            return rb.setMsg("缺少默认试用期员工角色");
+        }
         //员工类型
         //String personTypeKey = dto.getPersonTypeKey();
         String jobNumber = "";
@@ -328,6 +341,7 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
         if (StringUtils.isBlank(sysStaffPostDto.getPostSid())) {
             return rb.setMsg("岗位不能为空");
         }
+
         save(sysStaffinfo3);
         //添加用户信息
         SysUser sysUser = new SysUser();
@@ -346,6 +360,10 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
         if (!isSave) {
             return rb.setMsg("添加员工信息失败");
         }
+        SysUserRole sysUserRole = new SysUserRole();
+        sysUserRole.setUserSid(sysUser.getSid());
+        sysUserRole.setRoleSid(sysRoleVo.getSid());
+        sysUserRoleService.save(sysUserRole);
         return rb.success().setMsg("添加员工信息成功");
 
     }

anrui-scm/anrui-scm-ui/src/api/kucunguanli/price.js

@@ -0,0 +1,99 @@
+import request from '@/utils/request'
+
+export default {
+  // 查询分页列表
+  listPage: function(data) {
+    return request({
+      url: '/base/v1/basemodelmodprice/listPage',
+      method: 'post',
+      data: data,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  // 保存修改记录
+  saveOrUpdate: function(data) {
+    return request({
+      url: '/base/v1/basemodelmodprice/saveOrUpdate',
+      method: 'post',
+      data: data,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  delBySids: function(data) {
+    return request({
+      url: '/base/v1/basemodelmodprice/delBySids',
+      method: 'post',
+      data: data,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  // 查询车型和常用配置列表
+  configurationlistPage: function(parmas) {
+    return request({
+      url: '/base/basevehmodelconfig/selVehModelByUseOrgSidAndModelSidAndConfigSid',
+      method: 'post',
+      data: parmas,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  // 提交流程
+  submitVehicleApply: function(params) {
+    return request({
+      url: '/scm/v1/scmapplyinbound/submitRecordApplication',
+      method: 'post',
+      data: params,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  // 通过sid查询一条记录
+  fetchBySid: function(sid) {
+    return request({
+      url: '/base/v1/basemodelmodprice/fetchBySid/' + sid,
+      method: 'get'
+    })
+  },
+  // 代办任务同意办理
+  businessAgree: function(params) {
+    return request({
+      url: '/scm/v1/scmapplyinbound/complete',
+      method: 'post',
+      data: params,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  },
+  // 代办任务驳回任务
+  rejectTask: function(params) {
+    return request({
+      url: '/scm/v1/scmapplyinbound/reject/' + params.businessSid,
+      method: 'post',
+      data: params,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  },
+  // 代办任务终止任务
+  breakTask: function(params) {
+    return request({
+      url: '/scm/v1/scmapplyinbound/breakProcess/' + params.businessSid,
+      method: 'post',
+      data: params,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  },
+  // 代办任务撤回任务
+  revokeTask: function(params) {
+    return request({
+      url: '/scm/v1/scmapplyinbound/revokeProcess/' + params.userSid + '/' + params.businessSid,
+      method: 'post',
+      data: params,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  }
+}

anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js

@@ -240,6 +240,15 @@ const codemenu = [
           title: '车辆台账'
         }
       },
+      {
+        path: '/cheliang/chexingbaojia',
+        component: () =>
+          import('@/views/cheliang/chexingbaojia/daibaojiaguanli/daibaojia.vue'),
+        name: 'daibaojia',
+        meta: {
+          title: '车型报价'
+        }
+      },
 
       // 车辆信息
       {
@@ -351,16 +360,30 @@ const codemenu = [
   {
     path: '/kucunguanli',
     component: Layout,
-    redirect: '/kucunguanli/tiaojiaguanli',
+    redirect: '/kucunguanli',
     meta: {
       title: '库存管理'
     },
-    children: [{
-      path: '/kucunguanli/tiaojiaguanli',
-      component: () => import('@/views/kucunguanli/tiaojiaguanli/tiaojiashenqingguanli/priceguanli.vue'),
-      name: 'priceguanli',
-      meta: { title: '调价申请管理' }
-    }]
+    children: [
+      {
+        path: '/kucunguanli/tiaojiaguanli',
+        component: () => import('@/views/kucunguanli/tiaojiaguanli/priceguanli.vue'),
+        name: 'priceguanli',
+        meta: { title: '调价申请管理' }
+      },
+      {
+        path: '/kucunguanli/panku',
+        component: () => import('@/views/kucunguanli/panku/pankuguanli.vue'),
+        name: 'pankuguanli',
+        meta: { title: '盘库管理' }
+      },
+      {
+        path: '/kucunguanli/cheliangweihu/richangxunjian',
+        component: () => import('@/views/kucunguanli/cheliangweihu/richangxunjian/cheliangxunjian.vue'),
+        name: 'cheliangxunjianjiluchaxun',
+        meta: { title: '日常巡检' }
+      }
+    ]
   },
   // 入账管理
   {

anrui-scm/anrui-scm-ui/src/styles/index.scss

@@ -271,7 +271,12 @@ div:focus {
         .addinputw {
           padding: 5px 0;
           width: 65%;
-          margin-left: 75px;
+          margin-left: 80px;
+        }
+
+        .addinputInfo {
+          margin-left: 80px;
+          line-height: 48px;
         }
       }
     }

anrui-scm/anrui-scm-ui/src/views/cheliang/chexingbaojia/daibaojiaguanli/daibaojia.vue

@@ -0,0 +1,315 @@
+<template>
+  <div class="app-container">
+    <!-- Start 列表页面 -->
+    <div v-show="viewState == 1">
+      <button-bar view-title="车型报价" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
+      <div class="main-content">
+        <el-tabs v-model="activeName" @tab-click="handleClick" type="card" style="margin-top: 10px;">
+          <el-tab-pane label="待报价列表" name="first"></el-tab-pane>
+          <el-tab-pane label="已报价列表" name="second"></el-tab-pane>
+        </el-tabs>
+        <div class="searchcon">
+          <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
+          <div v-show="isSearchShow" class="search">
+            <el-form ref="listQueryform" :inline="true" :model="listQuery" class="tab-header">
+              <el-form-item label="品牌">
+                <el-select v-model="listQuery.params.vehicleType" placeholder="请选择" clearable class="addinputw">
+                  <el-option v-for="item in vehicleFunction_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="车型">
+                <el-select v-model="listQuery.params.productLine" placeholder="请选择" clearable class="addinputw">
+                  <el-option v-for="item in productLine_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="询价日期">
+                <div class="block" style="float: left;">
+                  <el-date-picker v-model="listQuery.params.warehousingStartTime" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
+                </div>
+                <div style="float: left;margin: 0px 10px">至</div>
+                <div class="block" style="float: left;">
+                  <el-date-picker v-model="listQuery.params.warehousingEndTime" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
+                </div>
+              </el-form-item>
+            </el-form>
+            <div class="btn" style="text-align: center;">
+              <el-button type="primary" @click="handleFilter" size="small">查询</el-button>
+              <el-button type="primary" @click="handleReset" size="small">重置</el-button>
+            </div>
+          </div>
+        </div>
+        <div class="listtop">
+          <div class="tit">待报价列表</div>
+          <pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
+        </div>
+        <div class="">
+          <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;">
+            <el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center"/>
+            <el-table-column label="操作" width="100px" align="center">
+              <template slot-scope="scope">
+                <el-button type="primary" size="mini" @click="handLook(scope.row)">查看</el-button>
+                <el-button type="primary" size="mini" @click="handBaoJia(scope.row)">报价</el-button>
+              </template>
+            </el-table-column>
+            <el-table-column label="品牌" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.vehicleVersion }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="车型" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.engineTypeValue }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="询价日期" align="center" width="180">
+              <template slot-scope="scope">
+                <span>{{ scope.row.vehicleTypeCode }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="询价人" align="center" width="180">
+              <template slot-scope="scope">
+                <span>{{ scope.row.vehicleTypeCode }}</span>
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
+        <div class="pages">
+          <!-- 翻页 -->
+          <pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
+        </div>
+      </div>
+    </div>
+    <!-- End 列表页面 -->
+    <diabaojiaAdd v-show="viewState == 2" ref="divAdd"/>
+    <daibaojiaInfo v-show="viewState == 3" ref="divInfo" @doback="resetState"/>
+    <yibaojia v-show="viewState == 4" ref="divYiBao" @doback="resetState"/>
+  </div>
+</template>
+
+<script>
+import { pagerList, pullDown } from '@/api/cheliang/basevehiclemodel'
+import Pagination from '@/components/pagination'
+import pageye from '@/components/pagination/pageye'
+import ButtonBar from '@/components/ButtonBar'
+import diabaojiaAdd from './diabaojiaAdd'
+import daibaojiaInfo from './daibaojiaInfo'
+import yibaojia from '../yibaojiaguanli/yibaojia'
+
+export default {
+  name: 'daibaojia',
+  components: {
+    Pagination,
+    pageye,
+    ButtonBar,
+    diabaojiaAdd,
+    daibaojiaInfo,
+    yibaojia
+  },
+  data() {
+    return {
+      viewState: 4,
+      activeName: 'first',
+      btndisabled: false,
+      btnList: [
+        {
+          type: 'info',
+          size: 'small',
+          icon: 'cross',
+          btnKey: 'doClose',
+          btnLabel: '关闭'
+        }
+      ],
+      isSearchShow: false,
+      searchxianshitit: '显示查询条件',
+      // 查询条件 -----------
+      tableKey: 0,
+      list: [],
+      vehicleFunction_list: [], // 功能
+      productLine_list: [], // 系列
+      FormLoading: false,
+      listLoading: false,
+      listQuery: {
+        params: {
+          carBrand: '',
+          vehicleType: '',
+          productLine: '',
+          driveForm: '',
+          power: '',
+          vehicleVersion: '',
+          fuelType: '',
+          vehicleTypeCode: '',
+          gearboxType: '',
+          emissionStandard: '',
+          engineType: '',
+          marketSegments: '',
+          specifications: ''
+        },
+        current: 1,
+        size: 10,
+        total: 0
+      },
+      rules: {}
+    }
+  },
+  created() {
+    // 初始化变量
+    this.init()
+    // 加载列表
+    this.getList()
+  },
+  mounted() {
+    this.$refs['btnbar'].setButtonList(this.btnList)
+  },
+  methods: {
+    // 搜索条件效果
+    clicksearchShow() {
+      this.isSearchShow = !this.isSearchShow
+      if (this.isSearchShow) {
+        this.searchxianshitit = '隐藏查询条件'
+      } else {
+        this.searchxianshitit = '显示查询条件'
+      }
+    },
+    btnHandle(btnKey) {
+      console.log('XXXXXXXXXXXXXXX    ' + btnKey)
+      switch (btnKey) {
+        case 'doClose':
+          this.doClose()
+          break
+        default:
+          break
+      }
+    },
+    init() {
+      // 下拉框-状态
+      pullDown({
+        type: 'vehicleFunction'
+      }).then((res) => {
+        if (res.code === '200') {
+          this.vehicleFunction_list = res.data
+          console.log('下拉框请求功能', res.data)
+        }
+      })
+      // 下拉框-打款状态
+      pullDown({
+        type: 'driver'
+      }).then((res) => {
+        if (res.code === '200') {
+          this.driveForm_list = res.data
+          console.log('下拉框请求驱动', res.data)
+        }
+      })
+    },
+    // 序号
+    indexMethod(index) {
+      var pagestart = (this.listQuery.current - 1) * this.listQuery.size
+      var pageindex = index + 1 + pagestart
+      return pageindex
+    },
+    // 查询列表信息
+    getList() {
+      this.listLoading = true
+      pagerList(this.listQuery).then((response) => {
+        console.log('列表查询结果：', response)
+        this.listLoading = false
+        if (
+          response.code === '200' &&
+          response.data &&
+          response.data.total > 0
+        ) {
+          this.list = response.data.records
+          this.listQuery.total = response.data.total
+        } else {
+          this.list = []
+          this.listQuery.total = 0
+        }
+      })
+    },
+    handleClick(tab, event) {
+      if (tab.name === 'second') {
+        this.viewState = 4
+        this.$refs['divYiBao'].loadList()
+      }
+    },
+    // 查询按钮
+    handleFilter() {
+      this.listQuery.current = 1
+      this.getList()
+    },
+    handleReset() {
+      this.listQuery = {
+        params: {
+          carBrand: '',
+          vehicleType: '',
+          productLine: '',
+          driveForm: '',
+          power: '',
+          vehicleVersion: '',
+          fuelType: '',
+          vehicleTypeCode: '',
+          gearboxType: '',
+          emissionStandard: '',
+          engineType: '',
+          marketSegments: '',
+          specifications: ''
+        },
+        current: 1,
+        size: 10,
+        total: 0
+      }
+      this.getList()
+    },
+    handBaoJia(row) {
+      this.viewState = 2
+      this.$refs['divAdd'].showInfo(row)
+    },
+    handLook(row) {
+      this.viewState = 3
+      this.$refs['divInfo'].showInfo(row)
+    },
+    resetState() {
+      this.viewState = 1
+    },
+    doClose() {
+      this.$store.dispatch('tagsView/delView', this.$route)
+      this.$router.go(-1)
+    }
+  }
+}
+</script>
+<style scoped>
+/deep/ .el-tabs__header {
+  border-bottom: 0px !important;
+}
+/deep/ .el-tabs__nav-scroll {
+  padding: 0px !important;
+  border-bottom: 0px !important;
+}
+.btn {
+  padding: 15px 0 15px 0;
+  border: 1px solid #e0e3eb;
+}
+
+.tab-header {
+  background-color: #edf1f7;
+  padding: 8px 20px;
+  margin-bottom: 0 !important;
+}
+
+.tab-header /deep/ .el-form-item {
+  margin-bottom: 10px;
+}
+.listtop {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  border: 1px solid #dfe4ed;
+  height: 40px;
+}
+.tit {
+  margin-bottom: -10px;
+}
+.pagination {
+  margin-bottom: -10px;
+}
+</style>

anrui-scm/anrui-scm-ui/src/views/cheliang/chexingbaojia/daibaojiaguanli/daibaojiaInfo.vue

@@ -0,0 +1,311 @@
+<template>
+  <div class="app-container">
+    <div class="tab-header webtop">
+      <div>销售支持报价</div>
+      <div>
+        <el-button type="info" size="small" @click="handleReturn">关闭</el-button>
+      </div>
+    </div>
+    <div class="listconadd">
+      <el-form ref="dataForm" :model="formobj" class="formaddcopy02">
+        <div class="headline">【品牌】车型询价单</div>
+        <el-row>
+          <el-col :span="8">
+            <div class="span-sty spanOneWidth"><span>销售专员</span></div>
+            <el-form-item><span class="addinputInfo addinputwOne">{{ formobj.name }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty spanTwoWidth"><span>联系电话</span></div>
+            <el-form-item><span class="addinputInfo addinputwTwo">{{ formobj.name }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty spanTwoWidth"><span>询价时间</span></div>
+            <el-form-item><span class="addinputInfo addinputwTwo">{{ formobj.name }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <div class="span-sty spanOneWidth"><span>车型</span></div>
+            <el-form-item><span class="addinputInfo addinputwOne">{{ formobj.name }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <div class="span-sty spanOneWidth"><span>车型配置</span></div>
+            <el-form-item><span class="addinputInfo addinputwOne">{{ formobj.name }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <div class="span-sty spanOneWidth"><span>换、选装说明</span></div>
+            <el-form-item><span class="addinputInfo addinputwOne">{{ formobj.name }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <div class="span-sty spanOneWidth"><span>其他特殊配置说明</span></div>
+            <el-form-item><span class="addinputInfo addinputwOne">{{ formobj.name }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <div class="headline">【品牌】车型报价单</div>
+        <div class="headtitle"><span>系列：{{ formobj.productLineValue }}<span style="margin-left: 20px">驱动：{{ formobj.driveFormValue }}<span style="margin-left: 20px">功能：{{ formobj.vehicleTypeValue }}<span style="margin-left: 20px">马力：{{ formobj.powerValue }}</span></span></span></span></div>
+        <el-row>
+          <el-col :span="3">
+            <div class="span-sty"><span>品牌</span></div>
+            <el-form-item><span class="addinputw">{{ formobj.brandName }}</span></el-form-item>
+          </el-col>
+          <el-col :span="3">
+            <div class="span-sty"><span>功能</span></div>
+            <el-form-item><span class="addinputw">{{ formobj.vehicleTypeValue }}</span></el-form-item>
+          </el-col>
+          <el-col :span="3">
+            <div class="span-sty"><span>系列</span></div>
+            <el-form-item><span class="addinputw">{{ formobj.productLineValue }}</span></el-form-item>
+          </el-col>
+          <el-col :span="3">
+            <div class="span-sty"><span>驱动</span></div>
+            <el-form-item><span class="addinputw">{{ formobj.driveFormValue }}</span></el-form-item>
+          </el-col>
+          <el-col :span="3">
+            <div class="span-sty"><span>马力</span></div>
+            <el-form-item><span class="addinputw">{{ formobj.powerValue }}</span></el-form-item>
+          </el-col>
+          <el-col :span="3">
+            <div class="span-sty"><span>版本</span></div>
+            <el-form-item><span class="addinputw">{{ formobj.vehicleVersionValue }}</span></el-form-item>
+          </el-col>
+          <el-col :span="3">
+            <div class="span-sty"><span>燃料</span></div>
+            <el-form-item><span class="addinputw">{{ formobj.fuelTypeValue }}</span></el-form-item>
+          </el-col>
+          <el-col :span="3">
+            <div class="span-sty"><span>变速箱</span></div>
+            <el-form-item><span class="addinputw">{{ formobj.gearboxTypeValue }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <div class="headline">车型信息</div>
+        <el-row>
+          <el-col :span="5">
+            <div class="span-sty spanTwoWidth"><span>排放标准</span></div>
+            <el-form-item><span class="addinputw addinputwTwo">{{ formobj.specifications }}</span></el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <div class="span-sty spanTwoWidth"><span>发动机型号</span></div>
+            <el-form-item><span class="addinputw addinputwTwo">{{ formobj.engineTypeValue }}</span></el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <div class="span-sty spanTwoWidth"><span>细分市场</span></div>
+            <el-form-item><span class="addinputw addinputwTwo">{{ formobj.marketSegmentsValue }}</span></el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <div class="span-sty spanTwoWidth"><span>规格型号</span></div>
+            <el-form-item><span class="addinputw addinputwTwo">{{ formobj.specifications }}</span></el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <div class="span-sty spanTwoWidth"><span>系别</span></div>
+            <el-form-item><span class="addinputw addinputwTwo">{{ formobj.department }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <div class="headline">常用配置</div>
+        <el-row>
+          <el-col :span="5">
+            <div class="span-sty"><span>颜色</span></div>
+            <el-form-item><span class="addinputw">{{ formobj.department }}</span></el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <div class="span-sty"><span>缓速器</span></div>
+            <el-form-item><span class="addinputw">{{ formobj.slowMachine }}</span></el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <div class="span-sty"><span>后视镜</span></div>
+            <el-form-item><span class="addinputw">{{ formobj.rearViewMirrorKey }}</span></el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <div class="span-sty"><span>轮胎</span></div>
+            <el-form-item><span class="addinputw">{{ formobj.tireSizeKey }}</span></el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <div class="span-sty"><span>驾驶室</span></div>
+            <el-form-item><span class="addinputw">{{ formobj.specification }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="5">
+            <div class="span-sty"><span>后桥速比</span></div>
+            <el-form-item><span class="addinputw">{{ formobj.rearAxleRatio }}</span></el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <div class="span-sty"><span>空调</span></div>
+            <el-form-item><span class="addinputw">{{ formobj.airConditionerKey }}</span></el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <div class="span-sty"><span>轮毂材质</span></div>
+            <el-form-item><span class="addinputw">{{ formobj.hubMaterialKey }}</span></el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <div class="span-sty"><span>导流罩</span></div>
+            <el-form-item><span class="addinputw">{{ formobj.baffleModelKey }}</span></el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <div class="span-sty"><span>悬架</span></div>
+            <el-form-item><span class="addinputw">{{ formobj.suspensionKey }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="5">
+            <div class="span-sty"><span>座椅</span></div>
+            <el-form-item><span class="addinputw">{{ formobj.seatKey }}</span></el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <div class="span-sty"><span>护轮罩</span></div>
+            <el-form-item><span class="addinputw">{{ formobj.tireCoverKey }}</span></el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <div class="span-sty"><span>鞍座</span></div>
+            <el-form-item><span class="addinputw">{{ formobj.saddleKey }}</span></el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <div class="span-sty"><span>轴距</span></div>
+            <el-form-item><span class="addinputw">{{ formobj.wheelbaseKey }}</span></el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <div class="span-sty"><span>保险杠</span></div>
+            <el-form-item><span class="addinputw">{{ formobj.bumperKey }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="5">
+            <div class="span-sty"><span>配置包</span></div>
+            <el-form-item><span class="addinputw">{{ formobj.configuringBaoKey }}</span></el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <div class="span-sty"><span>独立热源</span></div>
+            <el-form-item><span class="addinputw">{{ formobj.independentSourcesKey }}</span></el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <div class="span-sty"><span>燃料箱</span></div>
+            <el-form-item><span class="addinputw">{{ formobj.fuelTank }}</span></el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <div class="span-sty"><span>多媒体</span></div>
+            <el-form-item><span class="addinputw">{{ formobj.multimediaKey }}</span></el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <div class="span-sty"><span>货箱</span></div>
+            <el-form-item><span class="addinputw">{{ formobj.packingCase }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <div class="headline">更多配置</div>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item>{{ formobj.otherConfig }}</el-form-item>
+          </el-col>
+        </el-row>
+        <div class="headline">特殊或差异说明</div>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item>
+              <el-form-item>{{ formobj.otherConfig }}</el-form-item>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="span-sty spanOneWidth"><span>厂家结算价(万元)</span></div>
+            <el-form-item><span class="addinputwInfo addinputwOne">{{ formobj.otherConfig }}</span></el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <div class="span-sty spanOneWidth"><span>销售参考价(万元)</span></div>
+            <el-form-item><span class="addinputwInfo addinputwOne">{{ formobj.otherConfig }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <div class="span-sty spanOneWidth"><span>备注</span></div>
+            <el-form-item><span class="addinputwInfo addinputwOne">{{ formobj.remarks }}</span></el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+  </div>
+</template>
+
+<script>
+import { selectExiCarConfig } from '@/api/chexingchaxun/modelinquire.js'
+export default {
+  name: 'daibaojiaInfo',
+  data() {
+    return {
+      FormLoading: false,
+      formobj: {
+        name: '张磊'
+      },
+      sid_list: {
+        modelSid: '',
+        configSid: '',
+        userSid: window.sessionStorage.getItem('userSid')
+      }
+    }
+  },
+  created() {
+    this.init()
+  },
+  methods: {
+    // ----------------------------------方法--------------------
+    // 返回
+    handleReturn() {
+      this.$emit('doback')
+    },
+    // 查看
+    showInfo(sid, row) {
+      this.FormLoading = true
+      this.sid_list.modelSid = sid
+      this.sid_list.configSid = row.sid
+      selectExiCarConfig(this.sid_list).then((response) => {
+        this.FormLoading = false
+        if (response.code === '200') {
+          this.formobj = response.data
+        } else {
+          this.$notify({
+            title: '失败',
+            message: '查询失败',
+            type: 'error'
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+<style scoped>
+.headline{
+  height: 40px;
+  padding: 10px;
+  font-weight: bold;
+  font-size: 20px;
+  background-color: #0294d7;
+  text-align: left;
+  color: #ffffff;
+}
+.headtitle{
+  height: 40px;
+  padding: 10px;
+  font-weight: bold;
+  font-size: 18px;
+  background-color: #ffffff;
+  border-bottom: 1px solid #dfe4ed;
+  text-align: left;
+}
+.spanOneWidth {
+  width: 140px !important;
+}
+.spanTwoWidth {
+  width: 100px !important;
+}
+.addinputwOne {
+  margin-left: 150px !important;
+}
+.addinputwTwo {
+  margin-left: 110px !important;
+}
+</style>

anrui-scm/anrui-scm-ui/src/views/cheliang/chexingbaojia/daibaojiaguanli/diabaojiaAdd.vue

@@ -0,0 +1,594 @@
+<template>
+  <div class="app-container">
+    <div class="tab-header webtop">
+      <div>销售支持报价</div>
+      <div>
+        <el-button type="primary" size="small" @click="handleReturn">提交</el-button>
+        <el-button type="info" size="small" @click="handleReturn">关闭</el-button>
+      </div>
+    </div>
+    <div class="listconadd">
+      <el-form ref="dataForm" :model="formobj" class="formaddcopy02">
+        <div class="headline">【品牌】车型询价单</div>
+        <el-row>
+          <el-col :span="8">
+            <div class="span-sty spanOneWidth"><span>销售专员</span></div>
+            <el-form-item><span class="addinputInfo addinputwOne">{{ formobj.name }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty spanTwoWidth"><span>联系电话</span></div>
+            <el-form-item><span class="addinputInfo addinputwTwo">{{ formobj.name }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty spanTwoWidth"><span>询价时间</span></div>
+            <el-form-item><span class="addinputInfo addinputwTwo">{{ formobj.name }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <div class="span-sty spanOneWidth"><span>车型</span></div>
+            <el-form-item><span class="addinputInfo addinputwOne">{{ formobj.name }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <div class="span-sty spanOneWidth"><span>车型配置</span></div>
+            <el-form-item><span class="addinputInfo addinputwOne">{{ formobj.name }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <div class="span-sty spanOneWidth"><span>换、选装说明</span></div>
+            <el-form-item><span class="addinputInfo addinputwOne">{{ formobj.name }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <div class="span-sty spanOneWidth"><span>其他特殊配置说明</span></div>
+            <el-form-item><span class="addinputInfo addinputwOne">{{ formobj.name }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <div class="headline">【品牌】车型报价单</div>
+        <div class="headtitle"><span>系列：{{ formobj.productLineValue }}<span style="margin-left: 20px">驱动：{{ formobj.driveFormValue }}<span style="margin-left: 20px">功能：{{ formobj.vehicleTypeValue }}<span style="margin-left: 20px">马力：{{ formobj.powerValue }}</span></span></span></span></div>
+        <el-row>
+          <el-col :span="3">
+            <div class="span-sty"><span>品牌</span></div>
+            <el-form-item><span class="addinputw">{{ formobj.brandName }}</span></el-form-item>
+          </el-col>
+          <el-col :span="3">
+            <div class="span-sty"><span>功能</span></div>
+            <el-form-item><span class="addinputw">{{ formobj.vehicleTypeValue }}</span></el-form-item>
+          </el-col>
+          <el-col :span="3">
+            <div class="span-sty"><span>系列</span></div>
+            <el-form-item><span class="addinputw">{{ formobj.productLineValue }}</span></el-form-item>
+          </el-col>
+          <el-col :span="3">
+            <div class="span-sty"><span>驱动</span></div>
+            <el-form-item><span class="addinputw">{{ formobj.driveFormValue }}</span></el-form-item>
+          </el-col>
+          <el-col :span="3">
+            <div class="span-sty"><span>马力</span></div>
+            <el-form-item><span class="addinputw">{{ formobj.powerValue }}</span></el-form-item>
+          </el-col>
+          <el-col :span="3">
+            <div class="span-sty"><span>版本</span></div>
+            <el-form-item><span class="addinputw">{{ formobj.vehicleVersionValue }}</span></el-form-item>
+          </el-col>
+          <el-col :span="3">
+            <div class="span-sty"><span>燃料</span></div>
+            <el-form-item><span class="addinputw">{{ formobj.fuelTypeValue }}</span></el-form-item>
+          </el-col>
+          <el-col :span="3">
+            <div class="span-sty"><span>变速箱</span></div>
+            <el-form-item><span class="addinputw">{{ formobj.gearboxTypeValue }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <div class="headline">车型信息</div>
+        <el-row>
+          <el-col :span="5">
+            <div class="span-sty spanTwoWidth"><span>排放标准</span></div>
+            <el-form-item><span class="addinputw addinputwTwo">{{ formobj.specifications }}</span></el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <div class="span-sty spanTwoWidth"><span>发动机型号</span></div>
+            <el-form-item><span class="addinputw addinputwTwo">{{ formobj.engineTypeValue }}</span></el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <div class="span-sty spanTwoWidth"><span>细分市场</span></div>
+            <el-form-item><span class="addinputw addinputwTwo">{{ formobj.marketSegmentsValue }}</span></el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <div class="span-sty spanTwoWidth"><span>规格型号</span></div>
+            <el-form-item><span class="addinputw addinputwTwo">{{ formobj.specifications }}</span></el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <div class="span-sty spanTwoWidth"><span>系别</span></div>
+            <el-form-item><span class="addinputw addinputwTwo">{{ formobj.department }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <div class="headline">常用配置</div>
+        <el-row>
+          <el-col :span="5">
+            <div class="span-sty"><span>颜色</span></div>
+            <el-form-item>
+              <el-select v-model="formobj.carColor" placeholder="请选择" filterable clearable class="addinputw">
+                <el-option v-for="item in carColor_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+              </el-select>
+              <button style="border: 0px;background: #FFFFFF;font-size: 20px;margin-left: 2px" @click="add('bodyColor')">+</button>
+            </el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <div class="span-sty"><span>缓速器</span></div>
+            <el-form-item>
+              <el-select v-model="formobj.slowMachine" placeholder="请选择" filterable clearable class="addinputw">
+                <el-option v-for="item in slowMachine_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+              </el-select>
+              <button style="border: 0px;background: #FFFFFF;font-size: 20px;margin-left: 2px" @click="add('slowMachine')">+</button>
+            </el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <div class="span-sty"><span>后视镜</span></div>
+            <el-form-item>
+              <el-select v-model="formobj.rearViewMirrorKey" placeholder="请选择" filterable clearable class="addinputw">
+                <el-option v-for="item in rearViewMirror_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+              </el-select>
+              <button style="border: 0px;background: #FFFFFF;font-size: 20px;margin-left: 2px" @click="add('rearViewMirror')">+</button>
+            </el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <div class="span-sty"><span>轮胎</span></div>
+            <el-form-item>
+              <el-select v-model="formobj.tireSizeKey" placeholder="请选择" filterable clearable class="addinputw">
+                <el-option v-for="item in tireSize_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+              </el-select>
+              <button style="border: 0px;background: #FFFFFF;font-size: 20px;margin-left: 2px" @click="add('tireSize')">+</button>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <div class="span-sty"><span>驾驶室</span></div>
+            <el-form-item>
+              <el-select v-model="formobj.specification" placeholder="请选择" filterable clearable class="addinputw addinputwWidth">
+                <el-option v-for="item in specification_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+              </el-select>
+              <button style="border: 0px;background: #FFFFFF;font-size: 18px;" @click="add('specification')">+</button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="5">
+            <div class="span-sty"><span>后桥速比</span></div>
+            <el-form-item>
+              <el-select v-model="formobj.rearAxleRatio" placeholder="请选择" filterable clearable class="addinputw">
+                <el-option v-for="item in rearAxleRatio_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+              </el-select>
+              <button style="border: 0px;background: #FFFFFF;font-size: 20px;margin-left: 2px" @click="add('rearAxleRatio')">+</button>
+            </el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <div class="span-sty"><span>空调</span></div>
+            <el-form-item>
+              <el-select v-model="formobj.airConditionerKey" placeholder="请选择" filterable clearable class="addinputw">
+                <el-option v-for="item in airConditioner_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+              </el-select>
+              <button style="border: 0px;background: #FFFFFF;font-size: 20px;margin-left: 2px" @click="add('whether')">+</button>
+            </el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <div class="span-sty"><span>轮毂材质</span></div>
+            <el-form-item>
+              <el-select v-model="formobj.hubMaterialKey" placeholder="请选择" filterable clearable class="addinputw">
+                <el-option v-for="item in hubMaterial_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+              </el-select>
+              <button style="border: 0px;background: #FFFFFF;font-size: 20px;margin-left: 2px">+</button>
+            </el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <div class="span-sty"><span>导流罩</span></div>
+            <el-form-item>
+              <el-select v-model="formobj.baffleModelKey" placeholder="请选择" filterable clearable class="addinputw">
+                <el-option v-for="item in baffleModel_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+              </el-select>
+              <button style="border: 0px;background: #FFFFFF;font-size: 20px;margin-left: 2px">+</button>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <div class="span-sty"><span>悬架</span></div>
+            <el-form-item>
+              <el-select v-model="formobj.suspensionKey" placeholder="请选择" filterable clearable class="addinputw addinputwWidth">
+                <el-option v-for="item in suspension_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+              </el-select>
+              <button style="border: 0px;background: #FFFFFF;font-size: 18px;" @click="add('specification')">+</button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="5">
+            <div class="span-sty"><span>座椅</span></div>
+            <el-form-item>
+              <el-select v-model="formobj.seatKey" placeholder="请选择" filterable clearable class="addinputw">
+                <el-option v-for="item in seat_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+              </el-select>
+              <button style="border: 0px;background: #FFFFFF;font-size: 20px;margin-left: 2px">+</button>
+            </el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <div class="span-sty"><span>护轮罩</span></div>
+            <el-form-item>
+              <el-select v-model="formobj.tireCoverKey" placeholder="请选择" filterable clearable class="addinputw">
+                <el-option v-for="item in tireCover_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+              </el-select>
+              <button style="border: 0px;background: #FFFFFF;font-size: 20px;margin-left: 2px">+</button>
+            </el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <div class="span-sty"><span>鞍座</span></div>
+            <el-form-item>
+              <el-select v-model="formobj.saddleKey" placeholder="请选择" filterable clearable class="addinputw">
+                <el-option v-for="item in saddle_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+              </el-select>
+              <button style="border: 0px;background: #FFFFFF;font-size: 20px;margin-left: 2px">+</button>
+            </el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <div class="span-sty"><span>轴距</span></div>
+            <el-form-item>
+              <el-select v-model="formobj.wheelbaseKey" placeholder="请选择" filterable clearable class="addinputw">
+                <el-option v-for="item in wheelbase_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+              </el-select>
+              <button style="border: 0px;background: #FFFFFF;font-size: 20px;margin-left: 2px">+</button>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <div class="span-sty"><span>保险杠</span></div>
+            <el-form-item>
+              <el-select v-model="formobj.bumperKey" placeholder="请选择" filterable clearable class="addinputw addinputwWidth">
+                <el-option v-for="item in bumper_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+              </el-select>
+              <button style="border: 0px;background: #FFFFFF;font-size: 18px;" @click="add('specification')">+</button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="5">
+            <div class="span-sty"><span>配置包</span></div>
+            <el-form-item>
+              <el-select v-model="formobj.configuringBaoKey" placeholder="请选择" filterable clearable class="addinputw">
+                <el-option v-for="item in configuringBao_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+              </el-select>
+              <button style="border: 0px;background: #FFFFFF;font-size: 20px;margin-left: 2px">+</button>
+            </el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <div class="span-sty"><span>独立热源</span></div>
+            <el-form-item>
+              <el-select v-model="formobj.independentSourcesKey" placeholder="请选择" filterable clearable class="addinputw">
+                <el-option v-for="item in independentSources_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+              </el-select>
+              <button style="border: 0px;background: #FFFFFF;font-size: 20px;margin-left: 2px">+</button>
+            </el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <div class="span-sty"><span>燃料箱</span></div>
+            <el-form-item>
+              <el-select v-model="formobj.fuelTank" placeholder="请选择" filterable clearable class="addinputw">
+                <el-option v-for="item in fuelTank_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+              </el-select>
+              <button style="border: 0px;background: #FFFFFF;font-size: 20px;margin-left: 2px">+</button>
+            </el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <div class="span-sty"><span>多媒体</span></div>
+            <el-form-item>
+              <el-select v-model="formobj.multimediaKey" placeholder="请选择" filterable clearable class="addinputw">
+                <el-option v-for="item in multimedia_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+              </el-select>
+              <button style="border: 0px;background: #FFFFFF;font-size: 20px;margin-left: 2px">+</button>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <div class="span-sty"><span>货箱</span></div>
+            <el-form-item>
+              <el-select v-model="formobj.packingCase" placeholder="请选择" filterable clearable class="addinputw addinputwWidth">
+                <el-option v-for="item in packingCase_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+              </el-select>
+              <button style="border: 0px;background: #FFFFFF;font-size: 18px;" @click="add('specification')">+</button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <div class="headline">更多配置</div>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item>
+              <el-input v-model="formobj.otherConfig" clearable placeholder="" class="addinputw addinputwThree"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <div class="headline">特殊或差异说明</div>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item>
+              <el-input v-model="formobj.otherConfig" clearable placeholder="" class="addinputw addinputwThree"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="span-sty spanOneWidth"><span>厂家结算价(万元)</span></div>
+            <el-form-item>
+              <el-input v-model="formobj.otherConfig" @keyup.native="UpNumber" @keydown.native="UpNumber" class="addinputInfo addinputwOne" style="width: 30% !important;" clearable placeholder=""></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <div class="span-sty spanOneWidth"><span>销售参考价(万元)</span></div>
+            <el-form-item>
+              <el-input v-model="formobj.otherConfig" @keyup.native="UpNumber" @keydown.native="UpNumber" class="addinputInfo addinputwOne" style="width: 30% !important;" clearable placeholder=""></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <div class="span-sty spanOneWidth"><span>备注</span></div>
+            <el-form-item>
+              <el-input v-model="formobj.remarks" class="addinputInfo addinputwOne" style="width: 50% !important;" clearable placeholder=""></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+    <el-dialog :visible.sync="DialogVisible" width="50%">
+      <table class="e-table" cellspacing="0">
+        <tr>
+          <td>数据key</td>
+          <td>
+            <el-input v-model="dataDictionary_list.dictKey"></el-input>
+          </td>
+        </tr>
+        <tr>
+          <td>数据value</td>
+          <td>
+            <el-input v-model="dataDictionary_list.dictValue"></el-input>
+          </td>
+        </tr>
+      </table>
+      <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="save()">保 存</el-button>
+        <el-button @click="colse()">关 闭</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { selectExiCarConfig } from '@/api/chexingchaxun/modelinquire.js'
+import { typeValues } from '@/api/cheliang/dictcommons'
+export default {
+  name: 'xiaoshouzhichibaojia',
+  data() {
+    return {
+      FormLoading: false,
+      DialogVisible: false,
+      formobj: {
+        name: '张磊'
+      },
+      dataDictionary_list: {
+        dictType: '',
+        dictKey: '',
+        dictValue: '',
+        parentSid: '0'
+      },
+      carColor_list: [], // 颜色
+      slowMachine_list: [], // 缓速器
+      rearViewMirror_list: [], // 后视镜
+      tireSize_list: [], // 轮胎
+      specification_list: [], // 驾驶室
+      rearAxleRatio_list: [], // 后速桥比
+      airConditioner_list: [], // 空调
+      hubMaterial_list: [], // 轮毂材质
+      baffleModel_list: [], // 导流罩
+      suspension_list: [], // 悬架
+      seat_list: [], // 座椅
+      tireCover_list: [], // 护轮罩
+      saddle_list: [], // 鞍座
+      wheelbase_list: [], // 轴距
+      bumper_list: [], // 保险杠
+      configuringBao_list: [], // 配置包
+      independentSources_list: [], // 独立热源
+      fuelTank_list: [], // 燃料箱
+      multimedia_list: [], // 多媒体
+      packingCase_list: [], // 货箱
+      sid_list: {
+        modelSid: '',
+        configSid: '',
+        userSid: window.sessionStorage.getItem('userSid')
+      }
+    }
+  },
+  created() {
+    this.init()
+  },
+  methods: {
+    init() {
+      this.shujuzidian()
+    },
+    shujuzidian() {
+      typeValues({ type: 'bodyColor' }).then((res) => {
+        if (res.success) {
+          this.carColor_list = res.data
+        }
+      })
+      typeValues({ type: 'slowMachine' }).then((res) => {
+        if (res.success) {
+          this.slowMachine_list = res.data
+        }
+      })
+      typeValues({ type: 'rearviewMirror' }).then((res) => {
+        if (res.success) {
+          this.rearViewMirror_list = res.data
+        }
+      })
+      typeValues({ type: 'tiresize' }).then((res) => {
+        if (res.success) {
+          this.tireSize_list = res.data
+        }
+      })
+      typeValues({ type: 'specification' }).then((res) => {
+        if (res.success) {
+          this.specification_list = res.data
+        }
+      })
+      typeValues({ type: 'rearAxleRatio' }).then((res) => {
+        if (res.success) {
+          this.rearAxleRatio_list = res.data
+        }
+      })
+      typeValues({ type: 'whether' }).then((res) => {
+        if (res.success) {
+          this.airConditioner_list = res.data
+          console.log('下拉框请求空调', res.data)
+          this.baffleModel_list = res.data
+          console.log('下拉框请求导流罩', res.data)
+          this.tireCover_list = res.data
+          console.log('下拉框请求护轮罩', res.data)
+          this.independentSources_list = res.data
+          console.log('下拉框请求护独立热源', res.data)
+          this.multimedia_list = res.data
+          console.log('下拉框请求多媒体', res.data)
+        }
+      })
+      typeValues({ type: 'hubMaterial' }).then((res) => {
+        if (res.success) {
+          this.hubMaterial_list = res.data
+        }
+      })
+      typeValues({ type: 'suspension' }).then((res) => {
+        if (res.success) {
+          this.suspension_list = res.data
+        }
+      })
+      typeValues({ type: 'seat' }).then((res) => {
+        if (res.success) {
+          this.seat_list = res.data
+        }
+      })
+      typeValues({ type: 'saddle' }).then((res) => {
+        if (res.success) {
+          this.saddle_list = res.data
+        }
+      })
+      typeValues({ type: 'wheelbase' }).then((res) => {
+        if (res.success) {
+          this.wheelbase_list = res.data
+        }
+      })
+      typeValues({ type: 'bumper' }).then((res) => {
+        if (res.success) {
+          this.bumper_list = res.data
+        }
+      })
+      typeValues({ type: 'configuringBao' }).then((res) => {
+        if (res.success) {
+          this.configuringBao_list = res.data
+        }
+      })
+      typeValues({ type: 'fuelTank' }).then((res) => {
+        if (res.success) {
+          this.fuelTank_list = res.data
+        }
+      })
+      typeValues({ type: 'packingCase' }).then((res) => {
+        if (res.success) {
+          this.packingCase_list = res.data
+        }
+      })
+    },
+    UpNumber(e) {
+      e.target.value = e.target.value.replace(/[^0-9.]/g, '') // 清除“数字”和“.”"-"以外的字符
+      e.target.value = e.target.value.replace(/^00/, '0.') // 开头不能有两个0
+      e.target.value = e.target.value.replace(/\.{2,}/g, '.') // 只保留第一个. 清除多余的
+      e.target.value = e.target.value.replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/\-{2,}/g, '-') // 只保留第一个-
+      e.target.value = e.target.value.replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3') // 只能输入两个小数
+      if (e.target.value.indexOf('.') < 0 && e.target.value !== '' && e.target.value !== '-') {
+        // 以上已经过滤，此处控制的是如果没有小数点，首位不能为类似于 01、02的金额
+        e.target.value = parseFloat(e.target.value)
+      }
+    },
+    add(value) {
+      this.dataDictionary_list.dictType = value
+      this.DialogVisible = true
+    },
+    save() {},
+    colse() {
+      this.DialogVisible = false
+      this.dataDictionary_list = {
+        dictType: '',
+        dictKey: '',
+        dictValue: '',
+        parentSid: '0'
+      }
+    },
+    // ----------------------------------方法--------------------
+    // 返回
+    handleReturn() {
+      this.$emit('doback')
+    },
+    // 查看
+    showInfo(sid, row) {
+      this.FormLoading = true
+      this.sid_list.modelSid = sid
+      this.sid_list.configSid = row.sid
+      selectExiCarConfig(this.sid_list).then((response) => {
+        this.FormLoading = false
+        if (response.code === '200') {
+          this.formobj = response.data
+        } else {
+          this.$notify({
+            title: '失败',
+            message: '查询失败',
+            type: 'error'
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+<style scoped>
+.headline{
+  height: 40px;
+  padding: 10px;
+  font-weight: bold;
+  font-size: 20px;
+  background-color: #0294d7;
+  text-align: left;
+  color: #ffffff;
+}
+.headtitle{
+  height: 40px;
+  padding: 10px;
+  font-weight: bold;
+  font-size: 18px;
+  background-color: #ffffff;
+  border-bottom: 1px solid #dfe4ed;
+  text-align: left;
+}
+.spanOneWidth {
+  width: 140px !important;
+}
+.spanTwoWidth {
+  width: 100px !important;
+}
+.addinputwOne {
+  margin-left: 150px !important;
+}
+.addinputwTwo {
+  margin-left: 110px !important;
+}
+.addinputwThree {
+  width: 100% !important;
+  margin-left: 0px !important;
+}
+.addinputwWidth {
+  width: 55% !important;
+}
+</style>

anrui-scm/anrui-scm-ui/src/views/cheliang/chexingbaojia/yibaojiaguanli/vehicleconfiguration.vue

@@ -0,0 +1,253 @@
+<template>
+  <div class="app-container">
+    <div class="tab-header webtop">
+      <div>车型配置标准页面</div>
+      <div>
+        <el-button type="info" size="small" @click="handleReturn">关闭</el-button>
+      </div>
+    </div>
+    <div class="listadd">
+      <div class="wlInfo">
+        <span>车型配置标准页面</span>
+      </div>
+      <el-form ref="dataForm" :model="formobj" class="formaddcopy02">
+        <div class="headtitle"><span>系列：{{ formobj.productLineValue }}<span style="margin-left: 20px">驱动：{{ formobj.driveFormValue }}<span style="margin-left: 20px">功能：{{ formobj.vehicleTypeValue }}<span style="margin-left: 20px">马力：{{ formobj.powerValue }}</span></span></span></span></div>
+        <el-row>
+          <el-col :span="3">
+            <div class="span-sty"><span>品牌</span></div>
+            <el-form-item><span class="addinputw">{{ formobj.brandName }}</span></el-form-item>
+          </el-col>
+          <el-col :span="3">
+            <div class="span-sty"><span>功能</span></div>
+            <el-form-item><span class="addinputw">{{ formobj.vehicleTypeValue }}</span></el-form-item>
+          </el-col>
+          <el-col :span="3">
+            <div class="span-sty"><span>系列</span></div>
+            <el-form-item><span class="addinputw">{{ formobj.productLineValue }}</span></el-form-item>
+          </el-col>
+          <el-col :span="3">
+            <div class="span-sty"><span>驱动</span></div>
+            <el-form-item><span class="addinputw">{{ formobj.driveFormValue }}</span></el-form-item>
+          </el-col>
+          <el-col :span="3">
+            <div class="span-sty"><span>马力</span></div>
+            <el-form-item><span class="addinputw">{{ formobj.powerValue }}</span></el-form-item>
+          </el-col>
+          <el-col :span="3">
+            <div class="span-sty"><span>版本</span></div>
+            <el-form-item><span class="addinputw">{{ formobj.vehicleVersionValue }}</span></el-form-item>
+          </el-col>
+          <el-col :span="3">
+            <div class="span-sty"><span>燃料</span></div>
+            <el-form-item><span class="addinputw">{{ formobj.fuelTypeValue }}</span></el-form-item>
+          </el-col>
+          <el-col :span="3">
+            <div class="span-sty"><span>变速箱</span></div>
+            <el-form-item><span class="addinputw">{{ formobj.gearboxTypeValue }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <div class="headline">车型信息</div>
+        <el-row>
+          <el-col :span="5">
+            <div class="span-sty spanTwoWidth"><span>排放标准</span></div>
+            <el-form-item><span class="addinputw addinputwTwo">{{ formobj.specifications }}</span></el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <div class="span-sty spanTwoWidth"><span>发动机型号</span></div>
+            <el-form-item><span class="addinputw addinputwTwo">{{ formobj.engineTypeValue }}</span></el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <div class="span-sty spanTwoWidth"><span>细分市场</span></div>
+            <el-form-item><span class="addinputw addinputwTwo">{{ formobj.marketSegmentsValue }}</span></el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <div class="span-sty spanTwoWidth"><span>规格型号</span></div>
+            <el-form-item><span class="addinputw addinputwTwo">{{ formobj.specifications }}</span></el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <div class="span-sty spanTwoWidth"><span>系别</span></div>
+            <el-form-item><span class="addinputw addinputwTwo">{{ formobj.department }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <div class="headline">常用配置</div>
+        <el-row>
+          <el-col :span="5">
+            <div class="span-sty"><span>颜色</span></div>
+            <el-form-item><span class="addinputw">{{ formobj.department }}</span></el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <div class="span-sty"><span>缓速器</span></div>
+            <el-form-item><span class="addinputw">{{ formobj.slowMachine }}</span></el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <div class="span-sty"><span>后视镜</span></div>
+            <el-form-item><span class="addinputw">{{ formobj.rearViewMirrorKey }}</span></el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <div class="span-sty"><span>轮胎</span></div>
+            <el-form-item><span class="addinputw">{{ formobj.tireSizeKey }}</span></el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <div class="span-sty"><span>驾驶室</span></div>
+            <el-form-item><span class="addinputw">{{ formobj.specification }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="5">
+            <div class="span-sty"><span>后桥速比</span></div>
+            <el-form-item><span class="addinputw">{{ formobj.rearAxleRatio }}</span></el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <div class="span-sty"><span>空调</span></div>
+            <el-form-item><span class="addinputw">{{ formobj.airConditionerKey }}</span></el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <div class="span-sty"><span>轮毂材质</span></div>
+            <el-form-item><span class="addinputw">{{ formobj.hubMaterialKey }}</span></el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <div class="span-sty"><span>导流罩</span></div>
+            <el-form-item><span class="addinputw">{{ formobj.baffleModelKey }}</span></el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <div class="span-sty"><span>悬架</span></div>
+            <el-form-item><span class="addinputw">{{ formobj.suspensionKey }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="5">
+            <div class="span-sty"><span>座椅</span></div>
+            <el-form-item><span class="addinputw">{{ formobj.seatKey }}</span></el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <div class="span-sty"><span>护轮罩</span></div>
+            <el-form-item><span class="addinputw">{{ formobj.tireCoverKey }}</span></el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <div class="span-sty"><span>鞍座</span></div>
+            <el-form-item><span class="addinputw">{{ formobj.saddleKey }}</span></el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <div class="span-sty"><span>轴距</span></div>
+            <el-form-item><span class="addinputw">{{ formobj.wheelbaseKey }}</span></el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <div class="span-sty"><span>保险杠</span></div>
+            <el-form-item><span class="addinputw">{{ formobj.bumperKey }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="5">
+            <div class="span-sty"><span>配置包</span></div>
+            <el-form-item><span class="addinputw">{{ formobj.configuringBaoKey }}</span></el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <div class="span-sty"><span>独立热源</span></div>
+            <el-form-item><span class="addinputw">{{ formobj.independentSourcesKey }}</span></el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <div class="span-sty"><span>燃料箱</span></div>
+            <el-form-item><span class="addinputw">{{ formobj.fuelTank }}</span></el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <div class="span-sty"><span>多媒体</span></div>
+            <el-form-item><span class="addinputw">{{ formobj.multimediaKey }}</span></el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <div class="span-sty"><span>货箱</span></div>
+            <el-form-item><span class="addinputw">{{ formobj.packingCase }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <div class="headline">更多配置</div>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item>{{ formobj.otherConfig }}</el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+  </div>
+</template>
+
+<script>
+import { selectExiCarConfig } from '@/api/chexingchaxun/modelinquire.js'
+export default {
+  name: 'chexingpeizhibiaozhun',
+  data() {
+    return {
+      FormLoading: false,
+      guidedPrice: '',
+      priceValidity: '',
+      formobj: {},
+      sid_list: {
+        modelSid: '',
+        configSid: '',
+        userSid: window.sessionStorage.getItem('userSid')
+      }
+    }
+  },
+  methods: {
+    init() {
+      this.tempDate.sid = this.$route.query.sid
+    },
+    // ----------------------------------方法--------------------
+    // 返回
+    handleReturn() {
+      this.$emit('doback')
+    },
+    // 查看
+    showInfo(sid, row) {
+      this.FormLoading = true
+      this.sid_list.modelSid = sid
+      this.sid_list.configSid = row.sid
+      this.guidedPrice = row.guidedPrice
+      this.priceValidity = row.priceValidity
+      selectExiCarConfig(this.sid_list).then((response) => {
+        this.FormLoading = false
+        if (response.code === '200') {
+          this.formobj = response.data
+        } else {
+          this.$notify({
+            title: '失败',
+            message: '查询失败',
+            type: 'error'
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+<style scoped>
+.wlInfo {
+  padding: 40px 0;
+  font-size: 24px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+.headline{
+  height: 40px;
+  padding: 10px;
+  font-weight: bold;
+  font-size: 20px;
+  background-color: #0294d7;
+  text-align: left;
+  color: #ffffff;
+}
+.headtitle{
+  height: 40px;
+  padding: 10px;
+  font-weight: bold;
+  font-size: 18px;
+  background-color: #ffffff;
+  border-bottom: 1px solid #dfe4ed;
+  text-align: left;
+}
+.spanTwoWidth {
+  width: 100px !important;
+}
+.addinputwTwo {
+  margin-left: 110px !important;
+}
+</style>

anrui-scm/anrui-scm-ui/src/views/cheliang/chexingbaojia/yibaojiaguanli/yibaojia.vue

@@ -0,0 +1,321 @@
+<template>
+  <div class="app-container">
+    <!-- Start 列表页面 -->
+    <div v-show="viewState == 1">
+      <button-bar view-title="车型报价" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
+      <div class="main-content">
+        <el-tabs v-model="activeName" @tab-click="handleClick" type="card" style="margin-top: 10px;">
+          <el-tab-pane label="待报价列表" name="first"></el-tab-pane>
+          <el-tab-pane label="已报价列表" name="second"></el-tab-pane>
+        </el-tabs>
+        <div class="searchcon">
+          <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
+          <div v-show="isSearchShow" class="search">
+            <el-form ref="listQueryform" :inline="true" :model="listQuery" class="tab-header">
+              <el-form-item label="品牌">
+                <el-select v-model="listQuery.params.vehicleType" placeholder="请选择" clearable class="addinputw">
+                  <el-option v-for="item in vehicleFunction_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="车型">
+                <el-select v-model="listQuery.params.productLine" placeholder="请选择" clearable class="addinputw">
+                  <el-option v-for="item in productLine_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="报价日期">
+                <div class="block" style="float: left;">
+                  <el-date-picker v-model="listQuery.params.warehousingStartTime" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
+                </div>
+                <div style="float: left;margin: 0px 10px">至</div>
+                <div class="block" style="float: left;">
+                  <el-date-picker v-model="listQuery.params.warehousingEndTime" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
+                </div>
+              </el-form-item>
+            </el-form>
+            <div class="btn" style="text-align: center;">
+              <el-button type="primary" @click="handleFilter" size="small">查询</el-button>
+              <el-button type="primary" @click="handleReset" size="small">重置</el-button>
+            </div>
+          </div>
+        </div>
+        <div class="listtop">
+          <div class="tit">已报价列表</div>
+          <pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
+        </div>
+        <div class="">
+          <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;">
+            <el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center"/>
+            <el-table-column label="操作" width="100px" align="center">
+              <template slot-scope="scope">
+                <el-button type="primary" size="mini" @click="handLook(scope.row)">查看</el-button>
+              </template>
+            </el-table-column>
+            <el-table-column label="品牌" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.vehicleVersion }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="车型" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.engineTypeValue }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="特殊或差异说明" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.engineTypeValue }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="厂家结算价(万元)" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.engineTypeValue }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="销售指导价(万元)" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.engineTypeValue }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="报价日期" align="center" width="180">
+              <template slot-scope="scope">
+                <span>{{ scope.row.vehicleTypeCode }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="备注" align="center" width="180">
+              <template slot-scope="scope">
+                <span>{{ scope.row.vehicleTypeCode }}</span>
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
+        <div class="pages">
+          <!-- 翻页 -->
+          <pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
+        </div>
+      </div>
+    </div>
+    <!-- End 列表页面 -->
+    <yibaojiaInfo v-show="viewState ==2" ref="divInfo"/>
+    <vehicleconfiguration v-show="viewState ==3" ref="divVehicle"/>
+  </div>
+</template>
+
+<script>
+import { pagerList, pullDown } from '@/api/cheliang/basevehiclemodel'
+import Pagination from '@/components/pagination'
+import pageye from '@/components/pagination/pageye'
+import ButtonBar from '@/components/ButtonBar'
+import yibaojiaInfo from './yibaojiaInfo'
+import vehicleconfiguration from './vehicleconfiguration'
+
+export default {
+  name: 'yibaojia',
+  components: {
+    Pagination,
+    pageye,
+    ButtonBar,
+    yibaojiaInfo,
+    vehicleconfiguration
+  },
+  data() {
+    return {
+      viewState: 3,
+      activeName: 'second',
+      btndisabled: false,
+      btnList: [
+        {
+          type: 'info',
+          size: 'small',
+          icon: 'cross',
+          btnKey: 'doClose',
+          btnLabel: '关闭'
+        }
+      ],
+      isSearchShow: false,
+      searchxianshitit: '显示查询条件',
+      // 查询条件 -----------
+      tableKey: 0,
+      list: [],
+      vehicleFunction_list: [], // 功能
+      productLine_list: [], // 系列
+      FormLoading: false,
+      listLoading: false,
+      listQuery: {
+        params: {
+          carBrand: '',
+          vehicleType: '',
+          productLine: '',
+          driveForm: '',
+          power: '',
+          vehicleVersion: '',
+          fuelType: '',
+          vehicleTypeCode: '',
+          gearboxType: '',
+          emissionStandard: '',
+          engineType: '',
+          marketSegments: '',
+          specifications: ''
+        },
+        current: 1,
+        size: 10,
+        total: 0
+      },
+      rules: {}
+    }
+  },
+  created() {
+    // 初始化变量
+    this.init()
+    // 加载列表
+    this.getList()
+  },
+  mounted() {
+    this.$refs['btnbar'].setButtonList(this.btnList)
+  },
+  methods: {
+    // 搜索条件效果
+    clicksearchShow() {
+      this.isSearchShow = !this.isSearchShow
+      if (this.isSearchShow) {
+        this.searchxianshitit = '隐藏查询条件'
+      } else {
+        this.searchxianshitit = '显示查询条件'
+      }
+    },
+    btnHandle(btnKey) {
+      console.log('XXXXXXXXXXXXXXX    ' + btnKey)
+      switch (btnKey) {
+        case 'doClose':
+          this.doClose()
+          break
+        default:
+          break
+      }
+    },
+    init() {
+      // 下拉框-状态
+      pullDown({
+        type: 'vehicleFunction'
+      }).then((res) => {
+        if (res.code === '200') {
+          this.vehicleFunction_list = res.data
+          console.log('下拉框请求功能', res.data)
+        }
+      })
+      // 下拉框-打款状态
+      pullDown({
+        type: 'driver'
+      }).then((res) => {
+        if (res.code === '200') {
+          this.driveForm_list = res.data
+          console.log('下拉框请求驱动', res.data)
+        }
+      })
+    },
+    // 序号
+    indexMethod(index) {
+      var pagestart = (this.listQuery.current - 1) * this.listQuery.size
+      var pageindex = index + 1 + pagestart
+      return pageindex
+    },
+    // 查询列表信息
+    getList() {
+      this.listLoading = true
+      pagerList(this.listQuery).then((response) => {
+        console.log('列表查询结果：', response)
+        this.listLoading = false
+        if (
+          response.code === '200' &&
+          response.data &&
+          response.data.total > 0
+        ) {
+          this.list = response.data.records
+          this.listQuery.total = response.data.total
+        } else {
+          this.list = []
+          this.listQuery.total = 0
+        }
+      })
+    },
+    handleClick(tab,event){
+      if (tab.name === 'first') {
+        this.$emit('doback')
+      }
+    },
+    // 查询按钮
+    handleFilter() {
+      this.listQuery.current = 1
+      this.getList()
+    },
+    handleReset() {
+      this.listQuery = {
+        params: {
+          carBrand: '',
+          vehicleType: '',
+          productLine: '',
+          driveForm: '',
+          power: '',
+          vehicleVersion: '',
+          fuelType: '',
+          vehicleTypeCode: '',
+          gearboxType: '',
+          emissionStandard: '',
+          engineType: '',
+          marketSegments: '',
+          specifications: ''
+        },
+        current: 1,
+        size: 10,
+        total: 0
+      }
+      this.getList()
+    },
+    handLook(row) {
+      this.viewState = 3
+      this.$refs['divInfo'].showInfo(row)
+    },
+    resetState() {
+      this.viewState = 1
+    },
+    doClose() {
+      this.$store.dispatch('tagsView/delView', this.$route)
+      this.$router.go(-1)
+    }
+  }
+}
+</script>
+<style scoped>
+/deep/ .el-tabs__header {
+  border-bottom: 0px !important;
+}
+/deep/ .el-tabs__nav-scroll {
+  padding: 0px !important;
+  border-bottom: 0px !important;
+}
+.btn {
+  padding: 15px 0 15px 0;
+  border: 1px solid #e0e3eb;
+}
+
+.tab-header {
+  background-color: #edf1f7;
+  padding: 8px 20px;
+  margin-bottom: 0 !important;
+}
+
+.tab-header /deep/ .el-form-item {
+  margin-bottom: 10px;
+}
+.listtop {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  border: 1px solid #dfe4ed;
+  height: 40px;
+}
+.tit {
+  margin-bottom: -10px;
+}
+.pagination {
+  margin-bottom: -10px;
+}
+</style>

anrui-scm/anrui-scm-ui/src/views/cheliang/chexingbaojia/yibaojiaguanli/yibaojiaInfo.vue

@@ -0,0 +1,161 @@
+<template>
+  <div class="app-container">
+    <div class="tab-header webtop">
+      <div>已报价详情</div>
+      <div>
+        <el-button type="info" size="small" @click="handleReturn">关闭</el-button>
+      </div>
+    </div>
+    <div class="listconadd">
+      <el-form ref="dataForm" :model="formobj" class="formaddcopy02">
+        <div class="headline">【品牌】车型询价单</div>
+        <el-row>
+          <el-col :span="8">
+            <div class="span-sty spanOneWidth"><span>销售专员</span></div>
+            <el-form-item><span class="addinputInfo addinputwOne">{{ formobj.name }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty spanTwoWidth"><span>联系电话</span></div>
+            <el-form-item><span class="addinputInfo addinputwTwo">{{ formobj.name }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty spanTwoWidth"><span>询价时间</span></div>
+            <el-form-item><span class="addinputInfo addinputwTwo">{{ formobj.name }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <div class="span-sty spanOneWidth"><span>车型</span></div>
+            <el-form-item><span class="addinputInfo addinputwOne">{{ formobj.name }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <div class="span-sty spanOneWidth"><span>车型配置</span></div>
+            <el-form-item><span class="addinputInfo addinputwOne">{{ formobj.name }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <div class="span-sty spanOneWidth"><span>换、选装说明</span></div>
+            <el-form-item><span class="addinputInfo addinputwOne">{{ formobj.name }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <div class="span-sty spanOneWidth"><span>其他特殊配置说明</span></div>
+            <el-form-item><span class="addinputInfo addinputwOne">{{ formobj.name }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <div class="headline">【品牌】车型报价单</div>
+        <el-row>
+          <el-col :span="24">
+            <div class="span-sty spanOneWidth"><span>车型</span></div>
+            <el-form-item><span class="addinputInfo addinputwOne">{{ formobj.name }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <div class="span-sty spanOneWidth"><span>车型配置</span></div>
+            <el-form-item><span class="addinputInfo addinputwOne">{{ formobj.name }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <div class="span-sty spanOneWidth"><span>特殊或差异说明</span></div>
+            <el-form-item><span class="addinputInfo addinputwOne">{{ formobj.name }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="span-sty spanOneWidth"><span>厂家结算价(万元)</span></div>
+            <el-form-item><span class="addinputInfo addinputwOne">{{ formobj.name }}</span></el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <div class="span-sty spanOneWidth"><span>销售参考价(万元)</span></div>
+            <el-form-item><span class="addinputInfo addinputwOne">{{ formobj.name }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <div class="span-sty spanOneWidth"><span>备注</span></div>
+            <el-form-item><span class="addinputInfo addinputwOne">{{ formobj.remarks }}</span></el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+  </div>
+</template>
+
+<script>
+import { selectExiCarConfig } from '@/api/chexingchaxun/modelinquire.js'
+export default {
+  name: 'yibaojiaInfo',
+  data() {
+    return {
+      FormLoading: false,
+      guidedPrice: '',
+      priceValidity: '',
+      formobj: {},
+      sid_list: {
+        modelSid: '',
+        configSid: '',
+        userSid: window.sessionStorage.getItem('userSid')
+      }
+    }
+  },
+  methods: {
+    init() {
+      this.tempDate.sid = this.$route.query.sid
+    },
+    // ----------------------------------方法--------------------
+    // 返回
+    handleReturn() {
+      this.$emit('doback')
+    },
+    // 查看
+    showInfo(sid, row) {
+      this.FormLoading = true
+      this.sid_list.modelSid = sid
+      this.sid_list.configSid = row.sid
+      this.guidedPrice = row.guidedPrice
+      this.priceValidity = row.priceValidity
+      selectExiCarConfig(this.sid_list).then((response) => {
+        this.FormLoading = false
+        if (response.code === '200') {
+          this.formobj = response.data
+        } else {
+          this.$notify({
+            title: '失败',
+            message: '查询失败',
+            type: 'error'
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+<style scoped>
+.headline{
+  height: 40px;
+  padding: 10px;
+  font-weight: bold;
+  font-size: 20px;
+  background-color: #0294d7;
+  text-align: left;
+  color: #ffffff;
+}
+.spanOneWidth {
+  width: 140px !important;
+}
+.spanTwoWidth {
+  width: 100px !important;
+}
+.addinputwOne {
+  margin-left: 150px !important;
+}
+.addinputwTwo {
+  margin-left: 110px !important;
+}
+</style>

anrui-scm/anrui-scm-ui/src/views/kucunguanli/cheliangweihu/richangxunjian/cheliangxunjian.vue

@@ -0,0 +1,295 @@
+<template>
+  <div class="app-container">
+    <!-- Start 列表页面 -->
+    <div v-show="viewState == 1">
+      <button-bar view-title="车辆巡检记录查询" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
+      <div class="main-content">
+        <div class="searchcon">
+          <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
+          <div v-show="isSearchShow" class="search">
+            <el-form ref="listQueryform" :inline="true" :model="listQuery" class="tab-header">
+              <el-form-item label="车架号">
+                <el-input v-model="listQuery.params.mNum" placeholder="请输入车型" clearable/>
+              </el-form-item>
+              <el-form-item label="巡检日期">
+                <div class="block" style="float: left;">
+                  <el-date-picker v-model="listQuery.params.warehousingStartTime" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
+                </div>
+                <div style="float: left;margin: 0px 10px">至</div>
+                <div class="block" style="float: left;">
+                  <el-date-picker v-model="listQuery.params.warehousingEndTime" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
+                </div>
+              </el-form-item>
+              <el-form-item label="仓库">
+                <el-input v-model="listQuery.params.mNum" placeholder="请输入车型" clearable/>
+              </el-form-item>
+            </el-form>
+            <div class="btn" style="text-align: center;">
+              <el-button type="primary" @click="handleFilter" size="small">查询</el-button>
+              <el-button type="primary" @click="handleReset" size="small">重置</el-button>
+            </div>
+          </div>
+        </div>
+        <div class="listtop">
+          <div class="tit">车辆巡检记录列表</div>
+          <pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
+        </div>
+        <div class="">
+          <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;">
+            <el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center"/>
+            <el-table-column label="操作" width="150px" align="center">
+              <template slot-scope="scope">
+                <el-button type="primary" size="mini" @click="toEdit(scope.row)">保存</el-button>
+              </template>
+            </el-table-column>
+            <el-table-column label="车架号" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.vehicleVersion }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="状态" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.vehicleTypeCode }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="上次巡检日期" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.engineTypeValue }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="上次巡检人员" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.vehicleTypeCode }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="存放地点" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.vehicleTypeCode }}</span>
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
+        <div class="pages">
+          <!-- 翻页 -->
+          <pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
+        </div>
+      </div>
+    </div>
+    <cheliangxunjianhandle v-show="viewState == 2" ref="divHandle"/>
+    <xunjiandan v-show="viewState == 3" ref="divDan"/>
+  </div>
+</template>
+
+<script>
+import { pagerList } from '@/api/cheliang/basevehiclemodel'
+import Pagination from '@/components/pagination'
+import pageye from '@/components/pagination/pageye'
+import ButtonBar from '@/components/ButtonBar'
+import cheliangxunjianhandle from './cheliangxunjianhandle'
+import xunjiandan from './xunjiandan'
+import req from '@/api/anruiscm/scmmaterial'
+
+export default {
+  name: 'cheliangxunjianjiluchaxun',
+  components: {
+    Pagination,
+    pageye,
+    ButtonBar,
+    cheliangxunjianhandle,
+    xunjiandan
+  },
+  data() {
+    return {
+      btndisabled: false,
+      btnList: [
+        {
+          type: 'primary',
+          size: 'small',
+          icon: '',
+          btnKey: 'toAdd',
+          btnLabel: '生成巡检记录'
+        },
+        {
+          type: 'primary',
+          size: 'small',
+          icon: '',
+          btnKey: 'doDel',
+          btnLabel: '巡检'
+        },
+        {
+          type: 'info',
+          size: 'small',
+          icon: 'cross',
+          btnKey: 'doClose',
+          btnLabel: '关闭'
+        }
+      ],
+      isSearchShow: false,
+      searchxianshitit: '显示查询条件',
+      viewState: 3,
+      // 查询条件 -----------
+      tableKey: 0,
+      list: [],
+      FormLoading: false,
+      listLoading: false,
+      listQuery: {
+        params: {
+          carBrand: '',
+          vehicleType: '',
+          productLine: '',
+          driveForm: '',
+          power: '',
+          vehicleVersion: '',
+          fuelType: '',
+          vehicleTypeCode: '',
+          gearboxType: '',
+          emissionStandard: '',
+          engineType: '',
+          marketSegments: '',
+          specifications: ''
+        },
+        current: 1,
+        size: 10,
+        total: 0
+      },
+      rules: {}
+    }
+  },
+  created() {
+    // 加载列表
+    this.getList()
+  },
+  mounted() {
+    this.$refs['btnbar'].setButtonList(this.btnList)
+  },
+  methods: {
+    // 搜索条件效果
+    clicksearchShow() {
+      this.isSearchShow = !this.isSearchShow
+      if (this.isSearchShow) {
+        this.searchxianshitit = '隐藏查询条件'
+      } else {
+        this.searchxianshitit = '显示查询条件'
+      }
+    },
+    btnHandle(btnKey) {
+      console.log('XXXXXXXXXXXXXXX    ' + btnKey)
+      switch (btnKey) {
+        case 'toAdd':
+          this.toAdd()
+          break
+        case 'toEdit':
+          this.toEdit()
+          break
+        case 'doDel':
+          this.doDel()
+          break
+        case 'doImport':
+          this.doImport()
+          break
+        case 'doExport':
+          this.doExport()
+          break
+        case 'doClose':
+          this.doClose()
+          break
+        default:
+          break
+      }
+    },
+    // 序号
+    indexMethod(index) {
+      var pagestart = (this.listQuery.current - 1) * this.listQuery.size
+      var pageindex = index + 1 + pagestart
+      return pageindex
+    },
+    // 查询列表信息
+    getList() {
+      this.listLoading = true
+      pagerList(this.listQuery).then((response) => {
+        console.log('列表查询结果：', response)
+        this.listLoading = false
+        if (
+          response.success &&
+          response.data &&
+          response.data.total > 0
+        ) {
+          this.list = response.data.records
+          this.listQuery.total = response.data.total
+        } else {
+          this.list = []
+          this.listQuery.total = 0
+        }
+      })
+    },
+    // 查询按钮
+    handleFilter() {
+      this.listQuery.current = 1
+      this.getList()
+    },
+    handleReset() {
+      this.listQuery = {
+        params: {
+          carBrand: '',
+          vehicleType: '',
+          productLine: '',
+          driveForm: '',
+          power: '',
+          vehicleVersion: '',
+          fuelType: '',
+          vehicleTypeCode: '',
+          gearboxType: '',
+          emissionStandard: '',
+          engineType: '',
+          marketSegments: '',
+          specifications: ''
+        },
+        current: 1,
+        size: 10,
+        total: 0
+      }
+      this.getList()
+    },
+    toAdd() {
+      this.viewState = 2
+      this.$refs['divAdd'].showAdd()
+    },
+    resetState() {
+      this.viewState = 1
+    },
+    doClose() {
+      this.$store.dispatch('tagsView/delView', this.$route)
+      this.$router.go(-1)
+    }
+  }
+}
+</script>
+<style scoped>
+.btn {
+  padding: 15px 0 15px 0;
+  border: 1px solid #e0e3eb;
+}
+
+.tab-header {
+  background-color: #edf1f7;
+  padding: 8px 20px;
+  margin-bottom: 0 !important;
+}
+
+.tab-header /deep/ .el-form-item {
+  margin-bottom: 10px;
+}
+.listtop {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  border: 1px solid #dfe4ed;
+  height: 40px;
+}
+.tit {
+  margin-bottom: -10px;
+}
+.pagination {
+  margin-bottom: -10px;
+}
+</style>

anrui-scm/anrui-scm-ui/src/views/kucunguanli/cheliangweihu/richangxunjian/cheliangxunjianhandle.vue

@@ -0,0 +1,230 @@
+<template>
+  <div class="app-container">
+    <div v-show="viewState== 1">
+      <!--标题按钮部分开始-->
+      <div class="tab-header webtop">
+        <!--标题-->
+        <div>{{ viewTitle }}</div>
+        <!--start 添加修改按钮-->
+        <div>
+          <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
+        </div>
+      </div>
+      <!--标题按钮部分结束-->
+      <!--Start 新增修改部分-->
+      <div class="listconadd">
+        <div class="wlInfo"><span>车辆巡检操作</span></div>
+        <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
+          <el-row>
+            <el-col :span="12">
+              <div class="span-sty spanOneWidth"><span>存放地点:</span></div>
+              <el-form-item>
+                <el-select v-model="formobj.warehouse" placeholder="请选择" filterable clearable class="addinputwOne">
+                  <el-option v-for="item in warehouse_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <div class="span-sty spanOneWidth"><span>巡检人员:</span></div>
+              <el-form-item>
+                <el-select v-model="formobj.staff" placeholder="请选择" filterable clearable class="addinputwOne">
+                  <el-option v-for="item in staff_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12" style="border-bottom: 0px !important;">
+              <div class="span-sty spanOneWidth"><span>车架号:</span></div>
+              <el-form-item>
+                <el-input v-model="formobj.vinNo" placeholder="" clearable style="width: 30%" class="addinputwOne"/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12" style="border-bottom: 0px !important;">
+              <div class="span-sty spanOneWidth"></div>
+              <el-form-item>
+                <el-button type="primary" style="margin-left: 270px" size="small">查询</el-button>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <div class="listtop">
+          <div class="tit">库存车辆列表</div>
+        </div>
+        <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;">
+          <el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center"/>
+          <el-table-column label="操作" width="150px" align="center">
+            <template slot-scope="scope">
+              <el-button type="primary" size="mini" @click="toEdit(scope.row)">巡检</el-button>
+            </template>
+          </el-table-column>
+          <el-table-column label="车架号" width="140px" align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.vehicleVersion }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="状态" align="center" width="130px">
+            <template slot-scope="scope">
+              <span>{{ scope.row.vehicleTypeCode }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="上次巡检日期" align="center" width="150px">
+            <template slot-scope="scope">
+              <span>{{ scope.row.vehicleTypeCode }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="上次巡检人员" align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.vehicleTypeCode }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="存放地点" align="center" width="130px">
+            <template slot-scope="scope">
+              <span>{{ scope.row.vehicleTypeCode }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import req from '@/api/weishoumaiduan/unsold'
+import { typeValues } from '@/api/cheliang/dictcommons'
+
+export default {
+  name: 'cheliangxunjiancaozuo',
+  data() {
+    return {
+      viewTitle: '车辆巡检操作',
+      listLoading: false,
+      viewState: 1,
+      index: 0,
+      tableKey: 0,
+      list: [],
+      warehouse_list: [],
+      staff_list: [],
+      // 表单数据
+      formobj: {
+        sid: '', // 一条数据的sid
+        applicationName: window.sessionStorage.getItem('name'),
+        createTime: '',
+        reason: '',
+        userSid: window.sessionStorage.getItem('userSid'),
+        detailsList: []
+      },
+      rules: {},
+      submitdisabled: false
+    }
+  },
+  methods: {
+    init() {
+      typeValues({ type: 'warehouse' }).then((res) => {
+        if (res.success) {
+          this.warehouse_list = res.data
+        }
+      })
+    },
+    // 序号
+    indexMethod(index) {
+      var pagestart = (this.listQuery.current - 1) * this.listQuery.size
+      var pageindex = index + 1 + pagestart
+      return pageindex
+    },
+    showEdit(row) {
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+      console.log('编辑回显', row.sid)
+      req.fetchBySid(row.sid).then((resp) => {
+        const data = resp.data
+        this.formobj.applicationName = data.applicationName
+        this.formobj.sid = data.sid
+        this.formobj.reason = data.reason
+        this.formobj.createTime = data.createTime
+        this.formobj.detailsList = data.voList
+      }).catch((e) => {
+        this.formobj = row
+      })
+    },
+    save() {
+      this.$refs['form_obj'].validate((valid) => {
+        if (valid) {
+          this.submitdisabled = true
+          req.saveOrUpdate(this.formobj).then((resp) => {
+            this.submitdisabled = false
+            if (resp.success) {
+              this.$message({
+                showClose: true,
+                type: 'success',
+                message: resp.msg
+              })
+              this.handleReturn('true')
+            }
+          }).catch(() => {
+            this.submitdisabled = false
+          })
+        } else {
+          return false
+        }
+      })
+    },
+    // 返回（===既判断）
+    handleReturn(isreload) {
+      if (isreload === 'true') this.$emit('reloadlist')
+      // 表单数据
+      this.formobj = {
+        sid: '', // 一条数据的sid
+        applicationName: window.sessionStorage.getItem('name'),
+        createTime: '',
+        reason: '',
+        userSid: window.sessionStorage.getItem('userSid'),
+        detailsList: []
+      }
+      this.$refs['form_obj'].resetFields()
+      this.$refs['divVehicle'].getList()
+      this.$emit('doback')
+    },
+    closePage() {
+      this.viewState = 1
+    }
+  }
+}
+</script>
+
+<style scoped>
+.wlInfo {
+  text-align: center;
+  font-size: 28px;
+  line-height: 90px;
+}
+/deep/ .el-row {
+  border-left: 0px;
+}
+/deep/ .el-col {
+  border-right: 0px !important;
+}
+.spanOneWidth {
+  width: 260px !important;
+  border-right: 0px !important;
+}
+.addinputwOne {
+  margin-left: 270px !important;
+  padding: 5px 0px;
+}
+.listtop {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  border: 1px solid #dfe4ed;
+  height: 40px;
+}
+.tit {
+  margin-bottom: -10px;
+}
+.pagination {
+  margin-bottom: -10px;
+}
+</style>
+

anrui-scm/anrui-scm-ui/src/views/kucunguanli/cheliangweihu/richangxunjian/xunjiadanInfo.vue

@@ -0,0 +1,166 @@
+<template>
+  <div class="app-container">
+    <div v-show="viewState== 1">
+      <!--标题按钮部分开始-->
+      <div class="tab-header webtop">
+        <!--标题-->
+        <div>{{ viewTitle }}</div>
+        <!--start 添加修改按钮-->
+        <div>
+          <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
+        </div>
+      </div>
+      <!--标题按钮部分结束-->
+      <!--Start 新增修改部分-->
+      <div class="listconadd">
+        <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
+          <el-row style="border-left: 0px !important;">
+            <el-col :span="12" style="border-right: 0px !important;">
+              <div class="span-sty spanOneWidth" style="border-right: 0px !important;"><span>车架号:</span></div>
+              <el-form-item><span>{{ formobj.vinNo }}</span></el-form-item>
+            </el-col>
+            <el-col :span="12" style="border-right: 0px !important;">
+              <div class="span-sty spanOneWidth" style="border-right: 0px !important;"><span>车型:</span></div>
+              <el-form-item>{{ formobj.modelName }}</el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty spanOneWidth"><span>巡检情况说明:</span></div>
+              <el-form-item><span>{{ formobj.vinNo }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty spanOneWidth"><span>存在问题及处理结果:</span></div>
+              <el-form-item><span>{{ formobj.vinNo }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty spanOneWidth"><span>相关责任人:</span></div>
+              <el-form-item><span>{{ formobj.vinNo }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty spanOneWidth"><span>相关照片:</span></div>
+              <el-form-item><span>{{ formobj.vinNo }}</span></el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import req from '@/api/weishoumaiduan/unsold'
+import { typeValues } from '@/api/cheliang/dictcommons'
+
+export default {
+  name: 'cheliangxunjiancaozuo',
+  data() {
+    return {
+      viewTitle: '车辆巡检操作',
+      listLoading: false,
+      viewState: 1,
+      index: 0,
+      tableKey: 0,
+      list: [],
+      warehouse_list: [],
+      staff_list: [],
+      // 表单数据
+      formobj: {
+        sid: '', // 一条数据的sid
+        applicationName: window.sessionStorage.getItem('name'),
+        createTime: '',
+        reason: '',
+        userSid: window.sessionStorage.getItem('userSid'),
+        detailsList: []
+      },
+      rules: {},
+      submitdisabled: false
+    }
+  },
+  methods: {
+    init() {
+      typeValues({ type: 'warehouse' }).then((res) => {
+        if (res.success) {
+          this.warehouse_list = res.data
+        }
+      })
+    },
+    // 序号
+    indexMethod(index) {
+      var pagestart = (this.listQuery.current - 1) * this.listQuery.size
+      var pageindex = index + 1 + pagestart
+      return pageindex
+    },
+    showEdit(row) {
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+      console.log('编辑回显', row.sid)
+      req.fetchBySid(row.sid).then((resp) => {
+        const data = resp.data
+        this.formobj.applicationName = data.applicationName
+        this.formobj.sid = data.sid
+        this.formobj.reason = data.reason
+        this.formobj.createTime = data.createTime
+        this.formobj.detailsList = data.voList
+      }).catch((e) => {
+        this.formobj = row
+      })
+    },
+    save() {
+      this.$refs['form_obj'].validate((valid) => {
+        if (valid) {
+          this.submitdisabled = true
+          req.saveOrUpdate(this.formobj).then((resp) => {
+            this.submitdisabled = false
+            if (resp.success) {
+              this.$message({
+                showClose: true,
+                type: 'success',
+                message: resp.msg
+              })
+              this.handleReturn('true')
+            }
+          }).catch(() => {
+            this.submitdisabled = false
+          })
+        } else {
+          return false
+        }
+      })
+    },
+    // 返回（===既判断）
+    handleReturn(isreload) {
+      if (isreload === 'true') this.$emit('reloadlist')
+      // 表单数据
+      this.formobj = {
+        sid: '', // 一条数据的sid
+        applicationName: window.sessionStorage.getItem('name'),
+        createTime: '',
+        reason: '',
+        userSid: window.sessionStorage.getItem('userSid'),
+        detailsList: []
+      }
+      this.$refs['form_obj'].resetFields()
+      this.$refs['divVehicle'].getList()
+      this.$emit('doback')
+    },
+    closePage() {
+      this.viewState = 1
+    }
+  }
+}
+</script>
+
+<style scoped>
+.spanOneWidth {
+  width: 180px !important;
+}
+</style>
+

anrui-scm/anrui-scm-ui/src/views/kucunguanli/cheliangweihu/richangxunjian/xunjiandan.vue

@@ -0,0 +1,179 @@
+<template>
+  <div class="app-container">
+    <div v-show="viewState== 1">
+      <!--标题按钮部分开始-->
+      <div class="tab-header webtop">
+        <!--标题-->
+        <div>{{ viewTitle }}</div>
+        <!--start 添加修改按钮-->
+        <div>
+          <el-button type="primary" size="small" @click="handleReturn()">保存</el-button>
+          <el-button type="success" size="small" @click="handleReturn()">通过</el-button>
+          <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
+        </div>
+      </div>
+      <!--标题按钮部分结束-->
+      <!--Start 新增修改部分-->
+      <div class="listconadd">
+        <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
+          <el-row style="border-left: 0px !important;">
+            <el-col :span="12" style="border-right: 0px !important;">
+              <div class="span-sty spanOneWidth" style="border-right: 0px !important;"><span>车架号:</span></div>
+              <el-form-item><span>{{ formobj.vinNo }}</span></el-form-item>
+            </el-col>
+            <el-col :span="12" style="border-right: 0px !important;">
+              <div class="span-sty spanOneWidth" style="border-right: 0px !important;"><span>车型:</span></div>
+              <el-form-item>{{ formobj.modelName }}</el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty spanOneWidth"><span>巡检情况说明</span></div>
+              <el-form-item>
+                <el-input v-model="formobj.name" class="addinputw addinputwOne" style="width: 80%" type="textarea" resize="none" placeholder="" :autosize="{ minRows: 2, maxRows: 10}" clearable></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty spanOneWidth"><span>巡检情况说明</span></div>
+              <el-form-item>
+                <el-input v-model="formobj.name" class="addinputw addinputwOne" style="width: 80%" type="textarea" resize="none" placeholder="" :autosize="{ minRows: 2, maxRows: 10}" clearable></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty spanOneWidth"><span>相关责任人</span></div>
+              <el-form-item>
+                <el-select v-model="formobj.staff" placeholder="请选择" filterable clearable class="addinputw addinputwOne" style="width: 15%">
+                  <el-option v-for="item in staff_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty spanOneWidth"><span>相关照片</span></div>
+              <el-form-item><span>{{ formobj.vinNo }}</span></el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import req from '@/api/weishoumaiduan/unsold'
+import { typeValues } from '@/api/cheliang/dictcommons'
+
+export default {
+  name: 'cheliangxunjiancaozuo',
+  data() {
+    return {
+      viewTitle: '车辆巡检操作',
+      listLoading: false,
+      viewState: 1,
+      index: 0,
+      tableKey: 0,
+      list: [],
+      warehouse_list: [],
+      staff_list: [],
+      // 表单数据
+      formobj: {
+        sid: '', // 一条数据的sid
+        applicationName: window.sessionStorage.getItem('name'),
+        createTime: '',
+        reason: '',
+        userSid: window.sessionStorage.getItem('userSid'),
+        detailsList: []
+      },
+      rules: {},
+      submitdisabled: false
+    }
+  },
+  methods: {
+    init() {
+      typeValues({ type: 'warehouse' }).then((res) => {
+        if (res.success) {
+          this.warehouse_list = res.data
+        }
+      })
+    },
+    // 序号
+    indexMethod(index) {
+      var pagestart = (this.listQuery.current - 1) * this.listQuery.size
+      var pageindex = index + 1 + pagestart
+      return pageindex
+    },
+    showEdit(row) {
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+      console.log('编辑回显', row.sid)
+      req.fetchBySid(row.sid).then((resp) => {
+        const data = resp.data
+        this.formobj.applicationName = data.applicationName
+        this.formobj.sid = data.sid
+        this.formobj.reason = data.reason
+        this.formobj.createTime = data.createTime
+        this.formobj.detailsList = data.voList
+      }).catch((e) => {
+        this.formobj = row
+      })
+    },
+    save() {
+      this.$refs['form_obj'].validate((valid) => {
+        if (valid) {
+          this.submitdisabled = true
+          req.saveOrUpdate(this.formobj).then((resp) => {
+            this.submitdisabled = false
+            if (resp.success) {
+              this.$message({
+                showClose: true,
+                type: 'success',
+                message: resp.msg
+              })
+              this.handleReturn('true')
+            }
+          }).catch(() => {
+            this.submitdisabled = false
+          })
+        } else {
+          return false
+        }
+      })
+    },
+    // 返回（===既判断）
+    handleReturn(isreload) {
+      if (isreload === 'true') this.$emit('reloadlist')
+      // 表单数据
+      this.formobj = {
+        sid: '', // 一条数据的sid
+        applicationName: window.sessionStorage.getItem('name'),
+        createTime: '',
+        reason: '',
+        userSid: window.sessionStorage.getItem('userSid'),
+        detailsList: []
+      }
+      this.$refs['form_obj'].resetFields()
+      this.$refs['divVehicle'].getList()
+      this.$emit('doback')
+    },
+    closePage() {
+      this.viewState = 1
+    }
+  }
+}
+</script>
+
+<style scoped>
+.spanOneWidth {
+  width: 180px !important;
+}
+.addinputwOne {
+  margin-left: 190px !important;
+}
+</style>
+

anrui-scm/anrui-scm-ui/src/views/kucunguanli/panku/pankuAdd.vue

@@ -0,0 +1,240 @@
+<template>
+  <div class="app-container">
+    <div v-show="viewState== 1">
+      <!--标题按钮部分开始-->
+      <div class="tab-header webtop">
+        <!--标题-->
+        <div>{{ viewTitle }}</div>
+        <!--start 添加修改按钮-->
+        <div>
+          <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
+        </div>
+      </div>
+      <!--标题按钮部分结束-->
+      <!--Start 新增修改部分-->
+      <div class="listconadd">
+        <div class="wlInfo"><span>盘库操作</span></div>
+        <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
+          <el-row>
+            <el-col :span="12">
+              <div class="span-sty spanOneWidth"><span>存放地点:</span></div>
+              <el-form-item>
+                <el-select v-model="formobj.warehouse" placeholder="请选择" filterable clearable class="addinputwOne">
+                  <el-option v-for="item in warehouse_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <div class="span-sty spanOneWidth"><span>盘库人员:</span></div>
+              <el-form-item>
+                <el-select v-model="formobj.staff" placeholder="请选择" filterable clearable class="addinputwOne">
+                  <el-option v-for="item in staff_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12" style="border-bottom: 0px !important;">
+              <div class="span-sty spanOneWidth"><span>车架号:</span></div>
+              <el-form-item>
+                <el-input v-model="formobj.vinNo" placeholder="" clearable style="width: 30%" class="addinputwOne"/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12" style="border-bottom: 0px !important;">
+              <div class="span-sty spanOneWidth"></div>
+              <el-form-item>
+                <el-button type="primary" style="margin-left: 270px" size="small">查询</el-button>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <div class="listtop">
+          <div class="tit">库存车辆列表</div>
+        </div>
+        <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;">
+          <el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center"/>
+          <el-table-column label="操作" width="150px" align="center">
+            <template slot-scope="scope">
+              <el-button type="primary" size="mini" @click="toEdit(scope.row)">确认</el-button>
+            </template>
+          </el-table-column>
+          <el-table-column label="车架号" width="140px" align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.vehicleVersion }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="合格证" width="140px" align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.vehicleVersion }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="所在仓库" align="center" width="150px">
+            <template slot-scope="scope">
+              <span>{{ scope.row.engineTypeValue }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="上次盘库日期" align="center" width="150px">
+            <template slot-scope="scope">
+              <span>{{ scope.row.vehicleTypeCode }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="上次盘库人员" align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.vehicleTypeCode }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="状态" align="center" width="130px">
+            <template slot-scope="scope">
+              <span>{{ scope.row.vehicleTypeCode }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="备注" align="center" width="130px">
+            <template slot-scope="scope">
+              <span>{{ scope.row.vehicleTypeCode }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import req from '@/api/weishoumaiduan/unsold'
+import { typeValues } from '@/api/cheliang/dictcommons'
+
+export default {
+  name: 'pankuAdd',
+  data() {
+    return {
+      viewTitle: '盘库操作',
+      listLoading: false,
+      viewState: 1,
+      index: 0,
+      tableKey: 0,
+      list: [],
+      warehouse_list: [],
+      staff_list: [],
+      // 表单数据
+      formobj: {
+        sid: '', // 一条数据的sid
+        applicationName: window.sessionStorage.getItem('name'),
+        createTime: '',
+        reason: '',
+        userSid: window.sessionStorage.getItem('userSid'),
+        detailsList: []
+      },
+      rules: {},
+      submitdisabled: false
+    }
+  },
+  methods: {
+    init() {
+      typeValues({ type: 'warehouse' }).then((res) => {
+        if (res.success) {
+          this.warehouse_list = res.data
+        }
+      })
+    },
+    // 序号
+    indexMethod(index) {
+      var pagestart = (this.listQuery.current - 1) * this.listQuery.size
+      var pageindex = index + 1 + pagestart
+      return pageindex
+    },
+    showEdit(row) {
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+      console.log('编辑回显', row.sid)
+      req.fetchBySid(row.sid).then((resp) => {
+        const data = resp.data
+        this.formobj.applicationName = data.applicationName
+        this.formobj.sid = data.sid
+        this.formobj.reason = data.reason
+        this.formobj.createTime = data.createTime
+        this.formobj.detailsList = data.voList
+      }).catch((e) => {
+        this.formobj = row
+      })
+    },
+    save() {
+      this.$refs['form_obj'].validate((valid) => {
+        if (valid) {
+          this.submitdisabled = true
+          req.saveOrUpdate(this.formobj).then((resp) => {
+            this.submitdisabled = false
+            if (resp.success) {
+              this.$message({
+                showClose: true,
+                type: 'success',
+                message: resp.msg
+              })
+              this.handleReturn('true')
+            }
+          }).catch(() => {
+            this.submitdisabled = false
+          })
+        } else {
+          return false
+        }
+      })
+    },
+    // 返回（===既判断）
+    handleReturn(isreload) {
+      if (isreload === 'true') this.$emit('reloadlist')
+      // 表单数据
+      this.formobj = {
+        sid: '', // 一条数据的sid
+        applicationName: window.sessionStorage.getItem('name'),
+        createTime: '',
+        reason: '',
+        userSid: window.sessionStorage.getItem('userSid'),
+        detailsList: []
+      }
+      this.$refs['form_obj'].resetFields()
+      this.$refs['divVehicle'].getList()
+      this.$emit('doback')
+    },
+    closePage() {
+      this.viewState = 1
+    }
+  }
+}
+</script>
+
+<style scoped>
+.wlInfo {
+  text-align: center;
+  font-size: 28px;
+  line-height: 90px;
+}
+/deep/ .el-row {
+  border-left: 0px;
+}
+/deep/ .el-col {
+  border-right: 0px !important;
+}
+.spanOneWidth {
+  width: 260px !important;
+  border-right: 0px !important;
+}
+.addinputwOne {
+  margin-left: 270px !important;
+  padding: 5px 0px;
+}
+.listtop {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  border: 1px solid #dfe4ed;
+  height: 40px;
+}
+.tit {
+  margin-bottom: -10px;
+}
+.pagination {
+  margin-bottom: -10px;
+}
+</style>
+

anrui-scm/anrui-scm-ui/src/views/kucunguanli/panku/pankuguanli.vue

@@ -0,0 +1,305 @@
+<template>
+  <div class="app-container">
+    <!-- Start 列表页面 -->
+    <div v-show="viewState == 1">
+      <button-bar view-title="盘库记录查询" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
+      <div class="main-content">
+        <div class="searchcon">
+          <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
+          <div v-show="isSearchShow" class="search">
+            <el-form ref="listQueryform" :inline="true" :model="listQuery" class="tab-header">
+              <el-form-item label="最新盘库日期">
+                <div class="block" style="float: left;">
+                  <el-date-picker v-model="listQuery.params.warehousingStartTime" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
+                </div>
+                <div style="float: left;margin: 0px 10px">至</div>
+                <div class="block" style="float: left;">
+                  <el-date-picker v-model="listQuery.params.warehousingEndTime" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
+                </div>
+              </el-form-item>
+              <el-form-item label="车架号">
+                <el-input v-model="listQuery.params.mNum" placeholder="请输入车型" clearable/>
+              </el-form-item>
+              <el-form-item label="仓库">
+                <el-input v-model="listQuery.params.mNum" placeholder="请输入车型" clearable/>
+              </el-form-item>
+              <el-form-item label="状态">
+                <el-input v-model="listQuery.params.mNum" placeholder="请输入车型" clearable/>
+              </el-form-item>
+            </el-form>
+            <div class="btn" style="text-align: center;">
+              <el-button type="primary" @click="handleFilter" size="small">查询</el-button>
+              <el-button type="primary" @click="handleReset" size="small">重置</el-button>
+            </div>
+          </div>
+        </div>
+        <div class="listtop">
+          <div class="tit">盘库记录列表</div>
+          <pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
+        </div>
+        <div class="">
+          <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;">
+            <el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center"/>
+            <el-table-column label="操作" width="150px" align="center">
+              <template slot-scope="scope">
+                <el-button type="primary" size="mini" @click="toEdit(scope.row)">保存</el-button>
+              </template>
+            </el-table-column>
+            <el-table-column label="车架号" width="140px" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.vehicleVersion }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="合格证" width="140px" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.vehicleVersion }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="最新盘库日期" align="center" width="150px">
+              <template slot-scope="scope">
+                <span>{{ scope.row.engineTypeValue }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="最新仓库" align="center" width="150px">
+              <template slot-scope="scope">
+                <span>{{ scope.row.vehicleTypeCode }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="最新盘库人员" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.vehicleTypeCode }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="状态" align="center" width="130px">
+              <template slot-scope="scope">
+                <span>{{ scope.row.vehicleTypeCode }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="备注" align="center" width="130px">
+              <template slot-scope="scope">
+                <span>{{ scope.row.vehicleTypeCode }}</span>
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
+        <div class="pages">
+          <!-- 翻页 -->
+          <pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
+        </div>
+      </div>
+    </div>
+    <pankuAdd v-show="viewState == 2" ref="divAdd" @doback="resetState"/>
+  </div>
+</template>
+
+<script>
+import { pagerList } from '@/api/cheliang/basevehiclemodel'
+import Pagination from '@/components/pagination'
+import pageye from '@/components/pagination/pageye'
+import ButtonBar from '@/components/ButtonBar'
+import req from '@/api/anruiscm/scmmaterial'
+import pankuAdd from './pankuAdd'
+
+export default {
+  name: 'pankuguanli',
+  components: {
+    Pagination,
+    pageye,
+    ButtonBar,
+    pankuAdd
+  },
+  data() {
+    return {
+      btndisabled: false,
+      btnList: [
+        {
+          type: 'primary',
+          size: 'small',
+          icon: '',
+          btnKey: 'toAdd',
+          btnLabel: '生成盘库记录'
+        },
+        {
+          type: 'primary',
+          size: 'small',
+          icon: '',
+          btnKey: 'doDel',
+          btnLabel: '盘库'
+        },
+        {
+          type: 'info',
+          size: 'small',
+          icon: 'cross',
+          btnKey: 'doClose',
+          btnLabel: '关闭'
+        }
+      ],
+      isSearchShow: false,
+      searchxianshitit: '显示查询条件',
+      viewState: 1,
+      // 查询条件 -----------
+      tableKey: 0,
+      list: [],
+      FormLoading: false,
+      listLoading: false,
+      listQuery: {
+        params: {
+          carBrand: '',
+          vehicleType: '',
+          productLine: '',
+          driveForm: '',
+          power: '',
+          vehicleVersion: '',
+          fuelType: '',
+          vehicleTypeCode: '',
+          gearboxType: '',
+          emissionStandard: '',
+          engineType: '',
+          marketSegments: '',
+          specifications: ''
+        },
+        current: 1,
+        size: 10,
+        total: 0
+      },
+      rules: {}
+    }
+  },
+  created() {
+    // 加载列表
+    this.getList()
+  },
+  mounted() {
+    this.$refs['btnbar'].setButtonList(this.btnList)
+  },
+  methods: {
+    // 搜索条件效果
+    clicksearchShow() {
+      this.isSearchShow = !this.isSearchShow
+      if (this.isSearchShow) {
+        this.searchxianshitit = '隐藏查询条件'
+      } else {
+        this.searchxianshitit = '显示查询条件'
+      }
+    },
+    btnHandle(btnKey) {
+      console.log('XXXXXXXXXXXXXXX    ' + btnKey)
+      switch (btnKey) {
+        case 'toAdd':
+          this.toAdd()
+          break
+        case 'toEdit':
+          this.toEdit()
+          break
+        case 'doDel':
+          this.doDel()
+          break
+        case 'doImport':
+          this.doImport()
+          break
+        case 'doExport':
+          this.doExport()
+          break
+        case 'doClose':
+          this.doClose()
+          break
+        default:
+          break
+      }
+    },
+    // 序号
+    indexMethod(index) {
+      var pagestart = (this.listQuery.current - 1) * this.listQuery.size
+      var pageindex = index + 1 + pagestart
+      return pageindex
+    },
+    // 查询列表信息
+    getList() {
+      this.listLoading = true
+      pagerList(this.listQuery).then((response) => {
+        console.log('列表查询结果：', response)
+        this.listLoading = false
+        if (
+          response.success &&
+          response.data &&
+          response.data.total > 0
+        ) {
+          this.list = response.data.records
+          this.listQuery.total = response.data.total
+        } else {
+          this.list = []
+          this.listQuery.total = 0
+        }
+      })
+    },
+    // 查询按钮
+    handleFilter() {
+      this.listQuery.current = 1
+      this.getList()
+    },
+    handleReset() {
+      this.listQuery = {
+        params: {
+          carBrand: '',
+          vehicleType: '',
+          productLine: '',
+          driveForm: '',
+          power: '',
+          vehicleVersion: '',
+          fuelType: '',
+          vehicleTypeCode: '',
+          gearboxType: '',
+          emissionStandard: '',
+          engineType: '',
+          marketSegments: '',
+          specifications: ''
+        },
+        current: 1,
+        size: 10,
+        total: 0
+      }
+      this.getList()
+    },
+    toAdd() {
+      this.viewState = 2
+      this.$refs['divAdd'].showAdd()
+    },
+    resetState() {
+      this.viewState = 1
+    },
+    doClose() {
+      this.$store.dispatch('tagsView/delView', this.$route)
+      this.$router.go(-1)
+    }
+  }
+}
+</script>
+<style scoped>
+.btn {
+  padding: 15px 0 15px 0;
+  border: 1px solid #e0e3eb;
+}
+
+.tab-header {
+  background-color: #edf1f7;
+  padding: 8px 20px;
+  margin-bottom: 0 !important;
+}
+
+.tab-header /deep/ .el-form-item {
+  margin-bottom: 10px;
+}
+.listtop {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  border: 1px solid #dfe4ed;
+  height: 40px;
+}
+.tit {
+  margin-bottom: -10px;
+}
+.pagination {
+  margin-bottom: -10px;
+}
+</style>

anrui-scm/anrui-scm-ui/src/views/kucunguanli/tiaojiaguanli/chexingbyconfiguration.vue

@@ -0,0 +1,193 @@
+<template>
+  <div class="app-container">
+    <div>
+      <div class="tab-header webtop">
+        <div>车型常用列表</div>
+        <div>
+          <el-button type="primary" size="small" @click="AddUpdateReturn">确定</el-button>
+          <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
+        </div>
+      </div>
+      <div class="main-content">
+        <div class="searchcon">
+          <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
+          <div v-show="isSearchShow" class="search">
+            <el-form ref="listQueryform" :inline="true" :model="listQuery" class="tab-header">
+              <el-form-item label="客户名称:">
+                <el-input v-model="listQuery.params.customerName" placeholder="" clearable class="filter-item"/>
+              </el-form-item>
+              <el-form-item label="合同编号:">
+                <el-input v-model="listQuery.params.contractNo" placeholder="" clearable class="filter-item"/>
+              </el-form-item>
+            </el-form>
+            <div class="btn" style="text-align: center">
+              <el-button type="primary" size="small" @click="handleFilter">查询</el-button>
+              <el-button type="primary" size="small" @click="handresetting">重置</el-button>
+            </div>
+          </div>
+        </div>
+        <div class="">
+          <el-table :key="tableKey" ref="multipleTable" v-loading="listLoading" :data="list" border style="width: 100%" @selection-change="handleSelectionChange">
+            <el-table-column width="50px" type="selection" align="center"/>
+            <el-table-column width="80px" label="编号" type="index" :index="indexMethod" align="center"/>
+            <el-table-column label="车型" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.vehicleAlias }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="常用配置" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.configName }}</span>
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
+        <div class="pages">
+          <div class="tit"/>
+          <!-- 翻页 -->
+          <pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import Pagination from '@/components/pagination'
+import req from '@/api/kucunguanli/price'
+
+export default {
+  name: "chexingbyconfiguration",
+  components: {
+    Pagination
+  },
+  data() {
+    return {
+      isSearchShow: false,
+      searchxianshitit: '隐藏查询条件',
+      tableKey: 0,
+      showbackState: 30,
+      sids: [],
+      list: [],
+      datalist: [],
+      number: '',
+      listLoading: false,
+      listQuery: {
+        current: 1,
+        size: 10,
+        params: {
+          contractNo: '',
+          customerName: '',
+          useOrgSid: '',
+          sidList: []
+        },
+        total: 1
+      }
+    }
+  },
+  methods: {
+    // 搜索条件效果
+    clicksearchShow() {
+      this.isSearchShow = !this.isSearchShow
+      if (this.isSearchShow) {
+        this.searchxianshitit = '隐藏查询条件'
+      } else {
+        this.searchxianshitit = '显示查询条件'
+      }
+    },
+    indexMethod(index) {
+      var pagestart = (this.listQuery.current - 1) * this.listQuery.size
+      var pageindex = index + 1 + pagestart
+      return pageindex
+    },
+    // 返回
+    handleReturn() {
+      this.$emit('doback')
+    },
+    // 查询列表信息
+    getList() {
+      this.listLoading = true
+      req.configurationlistPage(this.listQuery).then((response) => {
+        this.listLoading = false
+        if (response.success) {
+          this.listQuery.total = response.data.total
+          this.list = response.data.records
+        }
+      })
+    },
+    // 查询按钮
+    handleFilter() {
+      this.getList()
+    },
+    // 重置按钮
+    handresetting() {
+      this.listQuery = {
+        current: 1,
+        size: 10,
+        params: {
+          contractNo: '',
+          customerName: '',
+          useOrgSid: '',
+          sidList: []
+        },
+        total: 0
+      }
+      this.getList()
+    },
+    handleSelectionChange(row) {
+      this.sids = []
+      const aa = []
+      row.forEach((element) => {
+        aa.push({
+          vehicleAlias: element.vehicleAlias,
+          modelSid: element.modelSid,
+          configName: element.configName,
+          configSid: element.configSid,
+          guidedPrice: element.guidedPrice
+        })
+      })
+      this.sids = aa
+    },
+    showData(value, userOrgSid) {
+      if (value.length > 0) {
+        for (var i = 0; i < value.length; i++) {
+          this.listQuery.params.sidList.push(value[i].modelSid, value[i].configurationItemsSid)
+        }
+      } else {
+        this.listQuery.params.sidList = []
+      }
+      this.listQuery.params.useOrgSid = userOrgSid
+      this.getList()
+    },
+    // 添加修改返回
+    AddUpdateReturn() {
+      if (this.sids.length > 0) {
+        this.$emit('backData', this.sids)
+      } else {
+        this.$notify({
+          title: '提示',
+          message: '请选择至少一条车型记录!',
+          type: 'error',
+          duration: 2000
+        })
+      }
+    }
+  }
+}
+</script>
+<style scoped>
+.btn {
+  padding: 15px 0 15px 0;
+  border: 1px solid #e0e3eb;
+}
+
+.tab-header {
+  background-color: #edf1f7;
+  padding: 8px 20px;
+  margin-bottom: 0 !important;
+}
+
+.tab-header /deep/ .el-form-item {
+  margin-bottom: 10px;
+}
+</style>

anrui-scm/anrui-scm-ui/src/views/kucunguanli/tiaojiaguanli/tiaojiashenqingguanli/priceAdd.vue → anrui-scm/anrui-scm-ui/src/views/kucunguanli/tiaojiaguanli/priceAdd.vue

@@ -7,7 +7,7 @@
         <div>{{ viewTitle }}</div>
         <!--start 添加修改按钮-->
         <div>
-          <el-button type="primary" size="small" :disabled="submitdisabled" @click="dialogStatus === 'add' ? saveAdd() : saveEdit()">保存
+          <el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate()">保存
           </el-button>
           <el-button type="primary" size="small" @click="submitVehicleApply()">提交
           </el-button>
@@ -18,19 +18,19 @@
       <!--Start 新增修改部分-->
       <div class="listconadd">
         <div class="wlInfo"><span>车辆调价申请</span></div>
-        <el-form ref="form_obj" :model="formobj" :rules="rules" label-position="top">
+        <el-form ref="form_obj" :model="formobj" :rules="rules">
           <el-row>
             <el-col :span="4">
               <span>调价申请日期:</span>
             </el-col>
             <el-col :span="8">
-              <span style="margin-left: 5px">{{ formobj.applicationDate }}</span>
+              <span style="margin-left: 5px">{{ formobj.createTime }}</span>
             </el-col>
             <el-col :span="4">
               <span>申请人:</span>
             </el-col>
             <el-col :span="8">
-              <span style="margin-left: 5px">{{ formobj.createByName }}</span>
+              <span style="margin-left: 5px">{{ formobj.applyPeoName }}</span>
             </el-col>
           </el-row>
           <el-row>
@@ -39,7 +39,7 @@
             </el-col>
             <el-col :span="20">
               <el-form-item>
-                <el-input v-model="formobj.remarks" clearable style="width: 30%"/>
+                <el-input v-model="formobj.modpriceReason" clearable style="width: 30%"/>
               </el-form-item>
             </el-col>
           </el-row>
@@ -50,41 +50,41 @@
             <el-button type="primary" size="mini" icon="el-icon-plus" @click="addCommodity()">选择车型</el-button>
           </div>
         </div>
-        <el-table :key="tableKey" :data="formobj.busVehicleApplyDetailDtoList" :index="index" border style="width: 100%">
+        <el-table :key="tableKey" :data="formobj.baseModelModpriceModels" :index="index" border style="width: 100%">
           <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
           <el-table-column fixed prop="name" label="操作" width="100px" align="center" header-align="center">
             <template slot-scope="scope">
-              <el-button size="mini" type="danger" @click="dataDelete(scope.$index, formobj.busVehicleApplyDetailDtoList[scope.$index])">删除
+              <el-button size="mini" type="danger" @click="dataDelete(scope.$index, formobj.baseModelModpriceModels[scope.$index])">删除
               </el-button>
             </template>
           </el-table-column>
           <el-table-column label="车型" align="left" header-align="center" width="250">
-            <template slot-scope="scope" prop="vehicleName">
-              <span>{{ scope.row.vehicleName }}</span>
+            <template slot-scope="scope">
+              <span>{{ scope.row.vehicleAlias }}</span>
             </template>
           </el-table-column>
           <el-table-column label="常用配置" align="left" header-align="center">
-            <template slot-scope="scope" prop="configName">
+            <template slot-scope="scope">
               <span>{{ scope.row.configName }}</span>
             </template>
           </el-table-column>
           <el-table-column prop="applyForDeposit" label="成本价" header-align="center" width="150">
-            <template slot-scope="scope" prop="applyForDeposit">
-              <el-input v-model="scope.row.applyForDeposit" placeholder="" @keyup.native="UpNumber" @keydown.native="UpNumber" class="addinputw" clearable/>
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.costPrice" placeholder="" @keyup.native="UpNumber" @keydown.native="UpNumber" class="addinputw" clearable/>
             </template>
           </el-table-column>
           <el-table-column label="现销售指导价(万元)" header-align="center" width="150">
-            <template slot-scope="scope" prop="saleGuPrice">
-              <el-input v-model="scope.row.saleGuPrice" placeholder="" @keyup.native="UpNumber" @keydown.native="UpNumber" class="addinputw" clearable/>
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.guidedPrice" placeholder="" @keyup.native="UpNumber" @keydown.native="UpNumber" class="addinputw" clearable/>
             </template>
           </el-table-column>
           <el-table-column label="价格增减数额" header-align="center" width="200">
-            <template slot-scope="scope" prop="insideCode">
-              <el-input v-model="scope.row.insideCode" placeholder="" @keyup.native="UpNumber" @keydown.native="UpNumber" class="addinputw" clearable/>
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.incOrDecInPrice" placeholder="" @keyup.native="UpNumber" @keydown.native="UpNumber" class="addinputw" clearable/>
             </template>
           </el-table-column>
           <el-table-column label="备注" header-align="center" width="200">
-            <template slot-scope="scope" prop="remarks">
+            <template slot-scope="scope">
               <el-input v-model="scope.row.remarks" placeholder="" class="addinputw" clearable/>
             </template>
           </el-table-column>
@@ -98,8 +98,8 @@
 </template>
 
 <script>
-import req from '@/api/supplychain/busvehicleapply'
-import configuration from '@/views/supplychain/cheliangpaichan/chexingbyconfiguration'
+import req from '@/api/kucunguanli/price'
+import configuration from './chexingbyconfiguration'
 
 export default {
   name: 'priceAdd',
@@ -109,22 +109,18 @@ export default {
   data() {
     return {
       viewTitle: '',
-      dialogStatus: '',
       viewState: 1,
       index: 0,
       tableKey: 0,
-      list1: [],
       // 表单数据
       formobj: {
         sid: '', // 一条数据的sid
-        createBySid: window.sessionStorage.getItem('userSid'), // 用户人sid
-        createByName: window.sessionStorage.getItem('name'), // 制单人
-        applicationCode: '', // 申请编号
-        applicationDate: '', // 申请日期
-        schedulingType: '', // 排产类型
-        remarks: '', // 备注
-        currentAmount: '', // 当前订金金额
-        busVehicleApplyDetailDtoList: []
+        createTime: '',
+        applyPeoName: window.sessionStorage.getItem('name'),
+        useOrgSid: '',
+        createOrgSid: '',
+        modpriceReason: '',
+        baseModelModpriceModels: []
       },
       rules: {},
       submitdisabled: false
@@ -143,7 +139,7 @@ export default {
       if (day < 10) {
         day = '0' + day
       }
-      this.formobj.applicationDate = year + '-' + month + '-' + day
+      this.formobj.createTime = year + '-' + month + '-' + day
     },
     UpNumber(e) {
       e.target.value = e.target.value.replace(/[^\d.-]/g, '') // 清除“数字”和“.”"-"以外的字符
@@ -159,38 +155,36 @@ export default {
     // 明细表添加一行数据
     addCommodity() {
       this.viewState = 2
-      this.$refs['divconfiguration'].showData(this.list1)
+      this.$refs['divconfiguration'].showData(this.formobj.baseModelModpriceModels, this.formobj.useOrgSid)
     },
     // 明细表删除一行数据
     dataDelete(index, row) {
-      this.formobj.busVehicleApplyDetailDtoList.splice(index, 1)
-      this.list1.splice(index, 1)
+      this.formobj.baseModelModpriceModels.splice(index, 1)
     },
-    showAdd() {
+    showAdd(createOrgSid) {
       this.newDate()
       this.$nextTick(() => {
         this.$refs['form_obj'].clearValidate()
       })
-      this.dialogStatus = 'add'
+      this.formobj.useOrgSid = createOrgSid
+      this.formobj.createOrgSid = createOrgSid
       this.viewTitle = '【新增】车辆调价申请'
     },
-    showEdit(sid, row) {
+    showEdit(row, createOrgSid) {
       this.$nextTick(() => {
         this.$refs['form_obj'].clearValidate()
       })
-      this.dialogStatus = 'edit'
       this.viewTitle = '【编辑】车辆调价申请'
-      console.log('编辑回显', sid)
-      req.fetchBySid(sid).then((resp) => {
+      console.log('编辑回显', row.sid)
+      req.fetchBySid(row.sid).then((resp) => {
         const data = resp.data
-        this.formobj.applicationCode = data.applicationCode
-        this.formobj.applicationDate = data.applicationDate
-        this.formobj.schedulingType = data.schedulingType
-        this.formobj.remarks = data.remarks
-        this.formobj.currentAmount = data.currentAmount
-        this.formobj.sid = sid
-        this.formobj.busVehicleApplyDetailDtoList = data.busVehicleApplyDetailVoList
-        this.list1 = data.busVehicleApplyDetailVoList
+        this.formobj.sid = row.sid
+        this.formobj.createOrgSid = createOrgSid
+        this.formobj.useOrgSid = createOrgSid
+        this.formobj.createTime = data.createTime
+        this.formobj.applyPeoName = data.applyPeoName
+        this.formobj.modpriceReason = data.modpriceReason
+        this.formobj.baseModelModpriceModels = data.baseModelModpriceModels
       }).catch((e) => {
         this.formobj = row
       })
@@ -198,61 +192,27 @@ export default {
     // 车型常用配置列表--新增确定返回的数据
     backData(value) {
       this.viewState = 1
-      if (this.formobj.busVehicleApplyDetailDtoList.length > 0) {
-        for (var i = 0; i < value.length; i++) {
-          for (var u = 0; u < this.formobj.busVehicleApplyDetailDtoList.length; u++) {
-            if (value[i].modelName === this.formobj.busVehicleApplyDetailDtoList[u].vehicleName && value[i].configName === this.formobj.busVehicleApplyDetailDtoList[u].configName) {
-              value.splice(value[i], 1)
-            }
-          }
-        }
-      }
       if (value.length > 0) {
         value.forEach((e) => {
-          this.formobj.busVehicleApplyDetailDtoList.push({
-            quantity: '',
-            applySid: '',
-            configSid: e.configurationItemsSid,
+          this.formobj.baseModelModpriceModels.push({
+            mainSid: '',
+            modelSid: e.modelSid,
+            vehicleAlias: e.vehicleAlias,
+            configSid: e.configSid,
             configName: e.configName,
-            // useDeposit: '',
-            applyForDeposit: '',
-            remarks: '',
-            saleGuPrice: '',
-            insideCode: e.insideCode, // 内部编码
-            vehicleName: e.modelName,
-            vehicleSid: e.modelSid
+            costPrice: '',
+            guidedPrice: e.guidedPrice,
+            incOrDecInPrice: '',
+            remarks: ''
           })
         })
-        this.list1 = this.formobj.busVehicleApplyDetailDtoList
       }
     },
-    saveAdd() {
-      this.$refs['form_obj'].validate((valid) => {
-        if (valid) {
-          this.submitdisabled = true
-          req.saveAdd(this.formobj).then((resp) => {
-            this.submitdisabled = false
-            if (resp.success) {
-              this.$message({
-                showClose: true,
-                type: 'success',
-                message: resp.msg
-              })
-              this.handleReturn('true')
-            }
-          }).catch(() => {
-            this.submitdisabled = false
-          })
-        } else {
-          return false
-        }
-      })
-    },
-    saveEdit() {
+    saveOrUpdate() {
       this.$refs['form_obj'].validate((valid) => {
         if (valid) {
           this.submitdisabled = true
-          req.saveEdit(this.formobj).then((resp) => {
+          req.saveOrUpdate(this.formobj).then((resp) => {
             this.submitdisabled = false
             this.$message({
               showClose: true,
@@ -293,9 +253,8 @@ export default {
       this.formobj.remarks = '' // 备注
       this.formobj.currentAmount = ''
       this.formobj.applicationCode = ''
-      this.formobj.applicationDate = ''
-      this.formobj.busVehicleApplyDetailDtoList = []
-      this.list1 = []
+      this.formobj.createTime = ''
+      this.formobj.baseModelModpriceModels = []
       this.$refs['form_obj'].resetFields()
       this.$refs['divconfiguration'].getList()
       this.$emit('doback')

anrui-scm/anrui-scm-ui/src/views/kucunguanli/tiaojiaguanli/tiaojiashenqingguanli/priceInfo.vue → anrui-scm/anrui-scm-ui/src/views/kucunguanli/tiaojiaguanli/priceInfo.vue

@@ -20,13 +20,13 @@
               <span>调价申请日期:</span>
             </el-col>
             <el-col :span="8">
-              <span style="margin-left: 5px">{{ formobj.applicationDate }}</span>
+              <span style="margin-left: 5px">{{ formobj.createTime }}</span>
             </el-col>
             <el-col :span="4">
               <span>申请人:</span>
             </el-col>
             <el-col :span="8">
-              <span style="margin-left: 5px">{{ formobj.createByName }}</span>
+              <span style="margin-left: 5px">{{ formobj.applyPeoName }}</span>
             </el-col>
           </el-row>
           <el-row>
@@ -35,7 +35,7 @@
             </el-col>
             <el-col :span="20">
               <el-form-item>
-                <span style="margin-left: 5px">{{ formobj.remarks }}</span>
+                <span style="margin-left: 5px">{{ formobj.modpriceReason }}</span>
               </el-form-item>
             </el-col>
           </el-row>
@@ -43,36 +43,36 @@
         <div class="tableStyle">
           <div style="margin-left: 5px;font-weight: bold">车辆列表</div>
         </div>
-        <el-table :key="tableKey" :data="formobj.busVehicleApplyDetailDtoList" :index="index" border style="width: 100%">
+        <el-table :key="tableKey" :data="formobj.baseModelModpriceModels" :index="index" border style="width: 100%">
           <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
-          <el-table-column label="车型" align="left" header-align="center" width="250">
-            <template slot-scope="scope" prop="vehicleName">
-              <span>{{ scope.row.vehicleName }}</span>
+          <el-table-column label="车型" align="center" header-align="center" width="250">
+            <template slot-scope="scope">
+              <span>{{ scope.row.vehicleAlias }}</span>
             </template>
           </el-table-column>
           <el-table-column label="常用配置" align="left" header-align="center">
-            <template slot-scope="scope" prop="configName">
+            <template slot-scope="scope">
               <span>{{ scope.row.configName }}</span>
             </template>
           </el-table-column>
-          <el-table-column prop="applyForDeposit" label="成本价" header-align="center" width="150">
-            <template slot-scope="scope" prop="applyForDeposit">
-              <span>{{ scope.row.vehicleName }}</span>
+          <el-table-column prop="applyForDeposit" label="成本价" header-align="center" align="center" width="150">
+            <template slot-scope="scope">
+              <span>{{ scope.row.costPrice }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="现销售指导价(万元)" header-align="center" width="150">
-            <template slot-scope="scope" prop="saleGuPrice">
-              <span>{{ scope.row.vehicleName }}</span>
+          <el-table-column label="现销售指导价(万元)" header-align="center" align="center" width="150">
+            <template slot-scope="scope">
+              <span>{{ scope.row.remarks }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="价格增减数额" header-align="center" width="200">
-            <template slot-scope="scope" prop="insideCode">
-              <span>{{ scope.row.vehicleName }}</span>
+          <el-table-column label="价格增减数额" header-align="center" align="center" width="200">
+            <template slot-scope="scope">
+              <span>{{ scope.row.incOrDecInPrice }}</span>
             </template>
           </el-table-column>
           <el-table-column label="备注" header-align="center" width="200">
-            <template slot-scope="scope" prop="remarks">
-              <span>{{ scope.row.vehicleName }}</span>
+            <template slot-scope="scope">
+              <span>{{ scope.row.remarks }}</span>
             </template>
           </el-table-column>
         </el-table>
@@ -83,7 +83,7 @@
 </template>
 
 <script>
-import req from '@/api/supplychain/busvehicleapply'
+import req from '@/api/kucunguanli/price'
 
 export default {
   name: 'priceInfo',
@@ -93,23 +93,17 @@ export default {
       index: 0,
       tableKey: 0,
       // 表单数据
-      formobj: {
-        sid: '', // 一条数据的sid
-        createBySid: window.sessionStorage.getItem('userSid'), // 用户人sid
-        createByName: window.sessionStorage.getItem('name'), // 制单人
-        applicationCode: '', // 申请编号
-        applicationDate: '', // 申请日期
-        schedulingType: '', // 排产类型
-        remarks: '', // 备注
-        currentAmount: '', // 当前订金金额
-        busVehicleApplyDetailDtoList: []
-      },
+      formobj: {},
       rules: {}
     }
   },
   methods: {
     showInfo(row) {
-
+      req.fetchBySid(row.sid).then((res) => {
+        if (res.success) {
+          this.formobj = res.data
+        }
+      })
     },
     // 返回（===既判断）
     handleReturn() {

anrui-scm/anrui-scm-ui/src/views/kucunguanli/tiaojiaguanli/tiaojiashenqingguanli/priceguanli.vue → anrui-scm/anrui-scm-ui/src/views/kucunguanli/tiaojiaguanli/priceguanli.vue

@@ -10,15 +10,15 @@
             <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
               <el-form-item label="申请日期">
                 <div class="block" style="float: left;">
-                  <el-date-picker v-model="listQuery.params.warehousingStartTime" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
+                  <el-date-picker v-model="listQuery.params.createStartTime" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
                 </div>
                 <div style="float: left;margin: 0px 10px">至</div>
                 <div class="block" style="float: left;">
-                  <el-date-picker v-model="listQuery.params.warehousingEndTime" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
+                  <el-date-picker v-model="listQuery.params.createEndTime" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
                 </div>
               </el-form-item>
               <el-form-item label="车型">
-                <el-input v-model="listQuery.params.mNum" placeholder="请输入车型" clearable/>
+                <el-input v-model="listQuery.params.vehicleAlias" placeholder="请输入车型" clearable/>
               </el-form-item>
             </el-form>
             <div class="btn" style="text-align: center;">
@@ -43,27 +43,27 @@
             </el-table-column>
             <el-table-column label="状态" width="140px" align="center">
               <template slot-scope="scope">
-                <span>{{ scope.row.vehicleVersion }}</span>
+                <span>{{ scope.row.nodeState }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="申请日期" align="center" width="150px">
+            <el-table-column label="申请日期" align="center">
               <template slot-scope="scope">
-                <span>{{ scope.row.engineTypeValue }}</span>
+                <span>{{ scope.row.createTime }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="申请人" align="center" width="150px">
+            <el-table-column label="申请人" align="center">
               <template slot-scope="scope">
-                <span>{{ scope.row.vehicleTypeCode }}</span>
+                <span>{{ scope.row.applyPeoName }}</span>
               </template>
             </el-table-column>
             <el-table-column label="车型" align="center">
               <template slot-scope="scope">
-                <span>{{ scope.row.vehicleTypeCode }}</span>
+                <span>{{ scope.row.vehicleAlias }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="调价原因" align="center" width="130px">
+            <el-table-column label="调价原因" align="center">
               <template slot-scope="scope">
-                <span>{{ scope.row.vehicleTypeCode }}</span>
+                <span>{{ scope.row.modpriceReason }}</span>
               </template>
             </el-table-column>
           </el-table>
@@ -80,13 +80,13 @@
 </template>
 
 <script>
-import { pagerList } from '@/api/cheliang/basevehiclemodel'
 import Pagination from '@/components/pagination'
 import pageye from '@/components/pagination/pageye'
 import ButtonBar from '@/components/ButtonBar'
 import priceAdd from './priceAdd.vue'
 import priceInfo from './priceInfo.vue'
-import req from '@/api/anruiscm/scmmaterial'
+import req from '@/api/kucunguanli/price'
+import { getPathSidByUserSid } from '@/api/cheliang/dictcommons'
 
 export default {
   name: 'priceguanli',
@@ -115,13 +115,6 @@ export default {
           btnKey: 'doDel',
           btnLabel: '删除'
         },
-        {
-          type: 'primary',
-          size: 'small',
-          icon: 'submit',
-          btnKey: 'doSubmit',
-          btnLabel: '提交'
-        },
         {
           type: 'info',
           size: 'small',
@@ -141,19 +134,10 @@ export default {
       listLoading: false,
       listQuery: {
         params: {
-          carBrand: '',
-          vehicleType: '',
-          productLine: '',
-          driveForm: '',
-          power: '',
-          vehicleVersion: '',
-          fuelType: '',
-          vehicleTypeCode: '',
-          gearboxType: '',
-          emissionStandard: '',
-          engineType: '',
-          marketSegments: '',
-          specifications: ''
+          createStartTime: '',
+          createEndTime: '',
+          vehicleAlias: '',
+          createOrgSid: ''
         },
         current: 1,
         size: 10,
@@ -164,7 +148,7 @@ export default {
   },
   created() {
     // 加载列表
-    this.getList()
+    this.init()
   },
   mounted() {
     this.$refs['btnbar'].setButtonList(this.btnList)
@@ -204,6 +188,15 @@ export default {
           break
       }
     },
+    init() {
+      getPathSidByUserSid({ userSid: window.sessionStorage.getItem('userSid') }).then((res) => {
+        if (res.success) {
+          this.listQuery.params.createOrgSid = res.data
+          this.getList()
+          console.log(this.listQuery.params.createOrgSid)
+        }
+      })
+    },
     // 序号
     indexMethod(index) {
       var pagestart = (this.listQuery.current - 1) * this.listQuery.size
@@ -221,7 +214,7 @@ export default {
     // 查询列表信息
     getList() {
       this.listLoading = true
-      pagerList(this.listQuery).then((response) => {
+      req.listPage(this.listQuery).then((response) => {
         console.log('列表查询结果：', response)
         this.listLoading = false
         if (
@@ -245,33 +238,24 @@ export default {
     handleReset() {
       this.listQuery = {
         params: {
-          carBrand: '',
-          vehicleType: '',
-          productLine: '',
-          driveForm: '',
-          power: '',
-          vehicleVersion: '',
-          fuelType: '',
-          vehicleTypeCode: '',
-          gearboxType: '',
-          emissionStandard: '',
-          engineType: '',
-          marketSegments: '',
-          specifications: ''
+          createStartTime: '',
+          createEndTime: '',
+          vehicleAlias: '',
+          createOrgSid: ''
         },
         current: 1,
         size: 10,
         total: 0
       }
-      this.getList()
+      this.init()
     },
     toAdd() {
       this.viewState = 2
-      this.$refs['divAdd'].showAdd()
+      this.$refs['divAdd'].showAdd(this.listQuery.params.createOrgSid)
     },
     toEdit(row) {
       this.viewState = 3
-      this.$refs['divAdd'].showEdit(row)
+      this.$refs['divAdd'].showEdit(row, this.listQuery.params.createOrgSid)
     },
     toInfo(row) {
       this.viewState = 4
@@ -297,7 +281,7 @@ export default {
         req.delBySids(this.sids).then(resp => {
           loading.close()
           this.$message({ type: 'success', message: resp.msg, showClose: true })
-          this.loadList()
+          this.init()
         }).catch(e => {
           loading.close()
         })