From f48c665c41efe6797db9a85a62ea89e287e61aa8 Mon Sep 17 00:00:00 2001 From: xd <844539747@qq.com> Date: Tue, 16 Apr 2024 15:55:02 +0800 Subject: [PATCH] '123' --- .../priceVerification/QuotHjController.java | 104 +++++++ .../web/controller/quot/QuotController.java | 57 +++- .../priceVerification/domain/QuotHj.java | 89 ++++++ .../mapper/QuotHjMapper.java | 61 ++++ .../service/IQuotHjService.java | 61 ++++ .../service/impl/QuotHjServiceImpl.java | 96 ++++++ .../main/java/com/ruoyi/quot/domain/Quot.java | 22 ++ .../mapper/priceVerification/QuotHjMapper.xml | 87 ++++++ .../main/resources/mapper/quot/QuotMapper.xml | 33 +- .../priceVerification/priceVerification.js | 44 +++ ruoyi-ui/src/api/quot/quot.js | 18 ++ .../priceVerification/index.vue | 290 ++++++++++++++++++ ruoyi-ui/src/views/quot/quot/index.vue | 134 +++++--- 13 files changed, 1039 insertions(+), 57 deletions(-) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/priceVerification/QuotHjController.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/priceVerification/domain/QuotHj.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/priceVerification/mapper/QuotHjMapper.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/priceVerification/service/IQuotHjService.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/priceVerification/service/impl/QuotHjServiceImpl.java create mode 100644 ruoyi-system/src/main/resources/mapper/priceVerification/QuotHjMapper.xml create mode 100644 ruoyi-ui/src/api/priceVerification/priceVerification.js create mode 100644 ruoyi-ui/src/views/priceVerification/priceVerification/index.vue diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/priceVerification/QuotHjController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/priceVerification/QuotHjController.java new file mode 100644 index 0000000..831ce20 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/priceVerification/QuotHjController.java @@ -0,0 +1,104 @@ +package com.ruoyi.web.controller.priceVerification; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.priceVerification.domain.QuotHj; +import com.ruoyi.priceVerification.service.IQuotHjService; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 报价单-核价单Controller + * + * @author ruoyi + * @date 2024-04-16 + */ +@RestController +@RequestMapping("/priceVerification/priceVerification") +public class QuotHjController extends BaseController +{ + @Autowired + private IQuotHjService quotHjService; + + /** + * 查询报价单-核价单列表 + */ + @PreAuthorize("@ss.hasPermi('priceVerification:priceVerification:list')") + @GetMapping("/list") + public TableDataInfo list(QuotHj quotHj) + { + startPage(); + List list = quotHjService.selectQuotHjList(quotHj); + return getDataTable(list); + } + + /** + * 导出报价单-核价单列表 + */ + @PreAuthorize("@ss.hasPermi('priceVerification:priceVerification:export')") + @Log(title = "报价单-核价单", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, QuotHj quotHj) + { + List list = quotHjService.selectQuotHjList(quotHj); + ExcelUtil util = new ExcelUtil(QuotHj.class); + util.exportExcel(response, list, "报价单-核价单数据"); + } + + /** + * 获取报价单-核价单详细信息 + */ + @PreAuthorize("@ss.hasPermi('priceVerification:priceVerification:query')") + @GetMapping(value = "/{quotHjId}") + public AjaxResult getInfo(@PathVariable("quotHjId") String quotHjId) + { + return success(quotHjService.selectQuotHjByQuotHjId(quotHjId)); + } + + /** + * 新增报价单-核价单 + */ + @PreAuthorize("@ss.hasPermi('priceVerification:priceVerification:add')") + @Log(title = "报价单-核价单", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody QuotHj quotHj) + { + return toAjax(quotHjService.insertQuotHj(quotHj)); + } + + /** + * 修改报价单-核价单 + */ + @PreAuthorize("@ss.hasPermi('priceVerification:priceVerification:edit')") + @Log(title = "报价单-核价单", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody QuotHj quotHj) + { + return toAjax(quotHjService.updateQuotHj(quotHj)); + } + + /** + * 删除报价单-核价单 + */ + @PreAuthorize("@ss.hasPermi('priceVerification:priceVerification:remove')") + @Log(title = "报价单-核价单", businessType = BusinessType.DELETE) + @DeleteMapping("/{quotHjIds}") + public AjaxResult remove(@PathVariable String[] quotHjIds) + { + return toAjax(quotHjService.deleteQuotHjByQuotHjIds(quotHjIds)); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java index 8baac09..725ce1c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java @@ -1,6 +1,5 @@ package com.ruoyi.web.controller.quot; -import java.util.Arrays; import java.util.List; import javax.servlet.http.HttpServletResponse; @@ -9,6 +8,8 @@ import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.file.FileUploadUtils; import com.ruoyi.common.utils.file.MinioUtil; import com.ruoyi.common.utils.uuid.UUID; +import com.ruoyi.priceVerification.domain.QuotHj; +import com.ruoyi.priceVerification.service.IQuotHjService; import com.ruoyi.quot.domain.QuotFile; import com.ruoyi.quot.service.IQuotFileService; import com.ruoyi.technicalConfirm.domain.QuotJsqr; @@ -46,6 +47,10 @@ public class QuotController extends BaseController @Autowired private IQuotJsqrService quotJsqrService; + @Autowired + private IQuotHjService quotHjService; + + /** * 查询报价列表 @@ -121,7 +126,7 @@ public class QuotController extends BaseController } /** - * + * 上传报价附件 * @param file 文件对象 * @param relation_id 关联业务表Id * @param file_type 文件类别 @@ -275,18 +280,43 @@ public class QuotController extends BaseController return success(); } + /** + * 报价单提交核价协助 + */ + @PreAuthorize("@ss.hasPermi('quot:quot:assistHj')") + @Log(title = "报价单提交核价协助", businessType = BusinessType.OTHER) + @PostMapping("/commitHjQuot") + public AjaxResult commitHjQuot(@RequestBody Quot quot) + { + + QuotHj quotHj = new QuotHj(); + String quotHjId = UUID.fastUUID().toString(); + quotHj.setQuotHjId(quotHjId); + quotHj.setQuotHjCode(IdUtils.createNo("BJD_HJ_",2)); + + quotHj.setCreateBy(getUsername()); + quotHj.setUpdateBy(getUsername()); + quotHjService.insertQuotHj(quotHj);//生成报价单-核价单 + + quot.setQuotHjId(quotHjId); + quot.setQuotHjApprovalStatus("1");//报价单-核价单 状态设置为 协助中 + quotService.updateQuot(quot); + + return success(); + } + /** * 报价组提交反馈 */ @PreAuthorize("@ss.hasPermi('quot:quot:feedback')") - @Log(title = "报价组提交反馈", businessType = BusinessType.OTHER) + @Log(title = "报价组-报价单提交反馈", businessType = BusinessType.OTHER) @PostMapping("/feedbackQuot") public AjaxResult feedbackQuot(@RequestBody Quot quot) { String quot_id = quot.getQuotId(); Quot info = quotService.selectQuotByQuotId(quot_id); - String quot_jsxz_approval_status = quot.getQuotId(); + String quot_jsxz_approval_status = quot.getQuotJsxzApprovalStatus(); if("1".equals(quot_jsxz_approval_status)){ return error("技术协助还未完成"); }else{ @@ -296,4 +326,23 @@ public class QuotController extends BaseController return success(); } + /** + * 报价组驳回 + */ + @PreAuthorize("@ss.hasPermi('quot:quot:reject')") + @Log(title = "报价组-报价单驳回", businessType = BusinessType.OTHER) + @PostMapping("/rejectQuot") + public AjaxResult rejectQuot(@RequestBody Quot quot) + { + String quot_id = quot.getQuotId(); + + Quot info = quotService.selectQuotByQuotId(quot_id); + String quot_feedback_explanation = quot.getQuotFeedbackExplanation(); + if(StringUtils.isEmpty(quot_feedback_explanation)){ + return error("反馈说明不能为空"); + } + info.setQuotApprovalStatus("3"); + quotService.updateQuot(info); + return success(); + } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/priceVerification/domain/QuotHj.java b/ruoyi-system/src/main/java/com/ruoyi/priceVerification/domain/QuotHj.java new file mode 100644 index 0000000..005fb3f --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/priceVerification/domain/QuotHj.java @@ -0,0 +1,89 @@ +package com.ruoyi.priceVerification.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 报价单-核价单对象 quot_hj + * + * @author ruoyi + * @date 2024-04-16 + */ +public class QuotHj extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 核价单Id */ + private String quotHjId; + + /** 核价单号 */ + @Excel(name = "核价单号") + private String quotHjCode; + + /** 核价类型 */ + @Excel(name = "核价类型") + private String quotHjPricingType; + + /** 核价日期 */ + @Excel(name = "核价日期") + private String quotHjPricingDate; + + /** 备注 */ + @Excel(name = "备注") + private String quotHjRemark; + + /** 备注 */ + @Excel(name = "核价协助状态") + private String quotHjApprovalStatus; + + public void setQuotHjId(String quotHjId) + { + this.quotHjId = quotHjId; + } + + public String getQuotHjId() + { + return quotHjId; + } + public void setQuotHjCode(String quotHjCode) + { + this.quotHjCode = quotHjCode; + } + + public String getQuotHjCode() + { + return quotHjCode; + } + public void setQuotHjPricingType(String quotHjPricingType) + { + this.quotHjPricingType = quotHjPricingType; + } + + public String getQuotHjPricingType() + { + return quotHjPricingType; + } + public void setQuotHjPricingDate(String quotHjPricingDate) + { + this.quotHjPricingDate = quotHjPricingDate; + } + + public String getQuotHjPricingDate() + { + return quotHjPricingDate; + } + public void setQuotHjRemark(String quotHjRemark) + { + this.quotHjRemark = quotHjRemark; + } + + public String getQuotHjRemark() + { + return quotHjRemark; + } + public String getQuotHjApprovalStatus() { return quotHjApprovalStatus; } + + public void setQuotHjApprovalStatus(String quotHjApprovalStatus) { this.quotHjApprovalStatus = quotHjApprovalStatus; } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/priceVerification/mapper/QuotHjMapper.java b/ruoyi-system/src/main/java/com/ruoyi/priceVerification/mapper/QuotHjMapper.java new file mode 100644 index 0000000..25306a7 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/priceVerification/mapper/QuotHjMapper.java @@ -0,0 +1,61 @@ +package com.ruoyi.priceVerification.mapper; + +import java.util.List; +import com.ruoyi.priceVerification.domain.QuotHj; + +/** + * 报价单-核价单Mapper接口 + * + * @author ruoyi + * @date 2024-04-16 + */ +public interface QuotHjMapper +{ + /** + * 查询报价单-核价单 + * + * @param quotHjId 报价单-核价单主键 + * @return 报价单-核价单 + */ + public QuotHj selectQuotHjByQuotHjId(String quotHjId); + + /** + * 查询报价单-核价单列表 + * + * @param quotHj 报价单-核价单 + * @return 报价单-核价单集合 + */ + public List selectQuotHjList(QuotHj quotHj); + + /** + * 新增报价单-核价单 + * + * @param quotHj 报价单-核价单 + * @return 结果 + */ + public int insertQuotHj(QuotHj quotHj); + + /** + * 修改报价单-核价单 + * + * @param quotHj 报价单-核价单 + * @return 结果 + */ + public int updateQuotHj(QuotHj quotHj); + + /** + * 删除报价单-核价单 + * + * @param quotHjId 报价单-核价单主键 + * @return 结果 + */ + public int deleteQuotHjByQuotHjId(String quotHjId); + + /** + * 批量删除报价单-核价单 + * + * @param quotHjIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteQuotHjByQuotHjIds(String[] quotHjIds); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/priceVerification/service/IQuotHjService.java b/ruoyi-system/src/main/java/com/ruoyi/priceVerification/service/IQuotHjService.java new file mode 100644 index 0000000..cccd360 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/priceVerification/service/IQuotHjService.java @@ -0,0 +1,61 @@ +package com.ruoyi.priceVerification.service; + +import java.util.List; +import com.ruoyi.priceVerification.domain.QuotHj; + +/** + * 报价单-核价单Service接口 + * + * @author ruoyi + * @date 2024-04-16 + */ +public interface IQuotHjService +{ + /** + * 查询报价单-核价单 + * + * @param quotHjId 报价单-核价单主键 + * @return 报价单-核价单 + */ + public QuotHj selectQuotHjByQuotHjId(String quotHjId); + + /** + * 查询报价单-核价单列表 + * + * @param quotHj 报价单-核价单 + * @return 报价单-核价单集合 + */ + public List selectQuotHjList(QuotHj quotHj); + + /** + * 新增报价单-核价单 + * + * @param quotHj 报价单-核价单 + * @return 结果 + */ + public int insertQuotHj(QuotHj quotHj); + + /** + * 修改报价单-核价单 + * + * @param quotHj 报价单-核价单 + * @return 结果 + */ + public int updateQuotHj(QuotHj quotHj); + + /** + * 批量删除报价单-核价单 + * + * @param quotHjIds 需要删除的报价单-核价单主键集合 + * @return 结果 + */ + public int deleteQuotHjByQuotHjIds(String[] quotHjIds); + + /** + * 删除报价单-核价单信息 + * + * @param quotHjId 报价单-核价单主键 + * @return 结果 + */ + public int deleteQuotHjByQuotHjId(String quotHjId); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/priceVerification/service/impl/QuotHjServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/priceVerification/service/impl/QuotHjServiceImpl.java new file mode 100644 index 0000000..6172f0d --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/priceVerification/service/impl/QuotHjServiceImpl.java @@ -0,0 +1,96 @@ +package com.ruoyi.priceVerification.service.impl; + +import java.util.List; +import com.ruoyi.common.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.priceVerification.mapper.QuotHjMapper; +import com.ruoyi.priceVerification.domain.QuotHj; +import com.ruoyi.priceVerification.service.IQuotHjService; + +/** + * 报价单-核价单Service业务层处理 + * + * @author ruoyi + * @date 2024-04-16 + */ +@Service +public class QuotHjServiceImpl implements IQuotHjService +{ + @Autowired + private QuotHjMapper quotHjMapper; + + /** + * 查询报价单-核价单 + * + * @param quotHjId 报价单-核价单主键 + * @return 报价单-核价单 + */ + @Override + public QuotHj selectQuotHjByQuotHjId(String quotHjId) + { + return quotHjMapper.selectQuotHjByQuotHjId(quotHjId); + } + + /** + * 查询报价单-核价单列表 + * + * @param quotHj 报价单-核价单 + * @return 报价单-核价单 + */ + @Override + public List selectQuotHjList(QuotHj quotHj) + { + return quotHjMapper.selectQuotHjList(quotHj); + } + + /** + * 新增报价单-核价单 + * + * @param quotHj 报价单-核价单 + * @return 结果 + */ + @Override + public int insertQuotHj(QuotHj quotHj) + { + quotHj.setCreateTime(DateUtils.getNowDate()); + return quotHjMapper.insertQuotHj(quotHj); + } + + /** + * 修改报价单-核价单 + * + * @param quotHj 报价单-核价单 + * @return 结果 + */ + @Override + public int updateQuotHj(QuotHj quotHj) + { + quotHj.setUpdateTime(DateUtils.getNowDate()); + return quotHjMapper.updateQuotHj(quotHj); + } + + /** + * 批量删除报价单-核价单 + * + * @param quotHjIds 需要删除的报价单-核价单主键 + * @return 结果 + */ + @Override + public int deleteQuotHjByQuotHjIds(String[] quotHjIds) + { + return quotHjMapper.deleteQuotHjByQuotHjIds(quotHjIds); + } + + /** + * 删除报价单-核价单信息 + * + * @param quotHjId 报价单-核价单主键 + * @return 结果 + */ + @Override + public int deleteQuotHjByQuotHjId(String quotHjId) + { + return quotHjMapper.deleteQuotHjByQuotHjId(quotHjId); + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/quot/domain/Quot.java b/ruoyi-system/src/main/java/com/ruoyi/quot/domain/Quot.java index 59e3883..85095eb 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/quot/domain/Quot.java +++ b/ruoyi-system/src/main/java/com/ruoyi/quot/domain/Quot.java @@ -119,6 +119,13 @@ public class Quot extends BaseEntity private String quotJsqrQtApprovalStatus;//技术协助-其他协助状态 private String quotJsqrQtRemark;//技术协助-其他协助说明 + /** 核价 */ + private String quotHjId;//核价单id + private String quotHjCode;//核价单号 + private String quotHjApprovalStatus;//核价协助状态 + private String quotHjPricingDate;//核价日期 + private String quotHjRemark;//核价备注 + /** 报价单-产品信息 */ private List quotMaterialList; @@ -352,4 +359,19 @@ public class Quot extends BaseEntity public String getQuotJsqrQtRemark() { return quotJsqrQtRemark; } public void setQuotJsqrQtRemark(String quotJsqrQtRemark) { this.quotJsqrQtRemark = quotJsqrQtRemark; } + public String getQuotHjId() { return quotHjId; } + + public void setQuotHjId(String quotHjId) { this.quotHjId = quotHjId; } + public String getQuotHjCode() { return quotHjCode; } + + public void setQuotHjCode(String quotHjCode) { this.quotHjCode = quotHjCode; } + public String getQuotHjApprovalStatus() { return quotHjApprovalStatus; } + + public void setQuotHjApprovalStatus(String quotHjApprovalStatus) { this.quotHjApprovalStatus = quotHjApprovalStatus; } + public String getQuotHjPricingDate() { return quotHjPricingDate; } + + public void setQuotHjPricingDate(String quotHjPricingDate) { this.quotHjPricingDate = quotHjPricingDate; } + public String getQuotHjRemark() { return quotHjRemark; } + + public void setQuotHjRemark(String quotHjRemark) { this.quotHjRemark = quotHjRemark; } } diff --git a/ruoyi-system/src/main/resources/mapper/priceVerification/QuotHjMapper.xml b/ruoyi-system/src/main/resources/mapper/priceVerification/QuotHjMapper.xml new file mode 100644 index 0000000..d0d6261 --- /dev/null +++ b/ruoyi-system/src/main/resources/mapper/priceVerification/QuotHjMapper.xml @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + + + + select quot_hj_id, quot_hj_code, quot_hj_pricing_type, quot_hj_pricing_date, quot_hj_remark, create_by, create_time, update_by, update_time from quot_hj + + + + + + + + insert into quot_hj + + quot_hj_id, + quot_hj_code, + quot_hj_pricing_type, + quot_hj_pricing_date, + quot_hj_remark, + create_by, + create_time, + update_by, + update_time, + + + #{quotHjId}, + #{quotHjCode}, + #{quotHjPricingType}, + #{quotHjPricingDate}, + #{quotHjRemark}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update quot_hj + + quot_hj_code = #{quotHjCode}, + quot_hj_pricing_type = #{quotHjPricingType}, + quot_hj_pricing_date = #{quotHjPricingDate}, + quot_hj_remark = #{quotHjRemark}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where quot_hj_id = #{quotHjId} + + + + delete from quot_hj where quot_hj_id = #{quotHjId} + + + + delete from quot_hj where quot_hj_id in + + #{quotHjId} + + + \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml b/ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml index 340507e..100d9ce 100644 --- a/ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml @@ -49,6 +49,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + @@ -69,6 +75,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join sys_user u on u.user_name=a.create_by left join sys_dept d on u.dept_id = d.dept_id left join quot_jsqr q on q.quot_jsqr_id = a.quot_jsxz_confirm_id + left join quot_hj h on h.quot_hj_id = a.quot_ht_id @@ -85,7 +92,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" q.quot_jsqr_tl_approval_status,q.quot_jsqr_tl_remark, q.quot_jsqr_dy_approval_status,q.quot_jsqr_dy_remark, q.quot_jsqr_zy_approval_status,q.quot_jsqr_zy_remark, - q.quot_jsqr_qt_approval_status,q.quot_jsqr_qt_remark + q.quot_jsqr_qt_approval_status,q.quot_jsqr_qt_remark, + + a.quot_ht_id,a.quot_hj_approval_status, + h.quot_hj_code,h.quot_hj_pricing_date, + h.quot_hj_remark + from quot a @@ -109,13 +121,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" a.quot_project, a.quot_quotation_date, a.quot_quotation_from, a.quot_quotation_require, a.quot_feedback_explanation, a.quot_quantity, a.quot_total_price, a.quot_check_user_name, a.quot_check_user_nickname, a.quot_approval_status, a.create_by, a.create_time, a.update_by, a.update_time, - a.quot_jsxz_standard,a.quot_jsxz_approval_status,a.quot_jsxz_chapter, - a.quot_jsxz_technical_requirement,a.quot_jsxz_group_values,a.quot_jsxz_confirm_id, + + a.quot_jsxz_standard,a.quot_jsxz_approval_status,a.quot_jsxz_chapter, + a.quot_jsxz_technical_requirement,a.quot_jsxz_group_values,a.quot_jsxz_confirm_id, q.quot_jsqr_code quot_jsxz_confirm_code, q.quot_jsqr_tl_approval_status,q.quot_jsqr_tl_remark, q.quot_jsqr_dy_approval_status,q.quot_jsqr_dy_remark, q.quot_jsqr_zy_approval_status,q.quot_jsqr_zy_remark, q.quot_jsqr_qt_approval_status,q.quot_jsqr_qt_remark, + + a.quot_ht_id,a.quot_hj_approval_status, + h.quot_hj_code,h.quot_hj_pricing_date, + h.quot_hj_remark, + b.mat_id as sub_mat_id, b.mat_xingh as sub_mat_xingh, b.mat_guig as sub_mat_guig, b.mat_diany as sub_mat_diany, b.mat_danw as sub_mat_danw, b.mat_sl as sub_mat_sl, b.quot_id as sub_quot_id @@ -160,6 +178,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" quot_jsxz_technical_requirement, quot_jsxz_group_values, quot_jsxz_confirm_id, + + quot_ht_id, + quot_hj_approval_status, #{quotId}, @@ -194,6 +215,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{quotJsxzTechnicalRequirement}, #{quotJsxzGroupValues}, #{quotJsxzConfirmId}, + + #{quotHjId}, + #{quotHjApprovalStatus}, @@ -231,6 +255,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" quot_jsxz_technical_requirement = #{quotJsxzTechnicalRequirement}, quot_jsxz_group_values = #{quotJsxzGroupValues}, quot_jsxz_confirm_id = #{quotJsxzConfirmId}, + + quot_ht_id = #{quotHjId}, + quot_hj_approval_status = #{quotHjApprovalStatus}, where quot_id = #{quotId} diff --git a/ruoyi-ui/src/api/priceVerification/priceVerification.js b/ruoyi-ui/src/api/priceVerification/priceVerification.js new file mode 100644 index 0000000..02f3be4 --- /dev/null +++ b/ruoyi-ui/src/api/priceVerification/priceVerification.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询报价单-核价单列表 +export function listPriceVerification(query) { + return request({ + url: '/priceVerification/priceVerification/list', + method: 'get', + params: query + }) +} + +// 查询报价单-核价单详细 +export function getPriceVerification(quotHjId) { + return request({ + url: '/priceVerification/priceVerification/' + quotHjId, + method: 'get' + }) +} + +// 新增报价单-核价单 +export function addPriceVerification(data) { + return request({ + url: '/priceVerification/priceVerification', + method: 'post', + data: data + }) +} + +// 修改报价单-核价单 +export function updatePriceVerification(data) { + return request({ + url: '/priceVerification/priceVerification', + method: 'put', + data: data + }) +} + +// 删除报价单-核价单 +export function delPriceVerification(quotHjId) { + return request({ + url: '/priceVerification/priceVerification/' + quotHjId, + method: 'delete' + }) +} diff --git a/ruoyi-ui/src/api/quot/quot.js b/ruoyi-ui/src/api/quot/quot.js index a99d951..c880292 100644 --- a/ruoyi-ui/src/api/quot/quot.js +++ b/ruoyi-ui/src/api/quot/quot.js @@ -79,6 +79,15 @@ export function commitJsQuot(data) { }) } +//提交核价协助 +export function commitHjQuot(data) { + return request({ + url: '/quot/quot/commitHjQuot', + method: 'post', + data: data + }) +} + //提交反馈按钮 export function feedbackQuot(data) { return request({ @@ -88,5 +97,14 @@ export function feedbackQuot(data) { }) } +//驳回按钮 +export function rejectQuot(data) { + return request({ + url: '/quot/quot/rejectQuot', + method: 'post', + data: data + }) +} + diff --git a/ruoyi-ui/src/views/priceVerification/priceVerification/index.vue b/ruoyi-ui/src/views/priceVerification/priceVerification/index.vue new file mode 100644 index 0000000..35a03b0 --- /dev/null +++ b/ruoyi-ui/src/views/priceVerification/priceVerification/index.vue @@ -0,0 +1,290 @@ + + + diff --git a/ruoyi-ui/src/views/quot/quot/index.vue b/ruoyi-ui/src/views/quot/quot/index.vue index c1f63fb..0725820 100644 --- a/ruoyi-ui/src/views/quot/quot/index.vue +++ b/ruoyi-ui/src/views/quot/quot/index.vue @@ -508,7 +508,59 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
保 存 提 交 + 提交技术协助 - 提交反馈 - 驳回 + 提交核价审核 + + 提交反馈 + 驳回
@@ -616,13 +671,13 @@ }