From c10f62da9d842803f6020720415195170c0433dd Mon Sep 17 00:00:00 2001 From: xd <844539747@qq.com> Date: Fri, 9 Aug 2024 15:39:30 +0800 Subject: [PATCH] '123' --- .../ruoyi/web/controller/quot/QuotController.java | 12 +++++++++++- .../main/java/com/ruoyi/quot/mapper/QuotMapper.java | 7 +++++++ .../java/com/ruoyi/quot/service/IQuotService.java | 7 +++++++ .../com/ruoyi/quot/service/impl/QuotServiceImpl.java | 9 +++++++++ .../src/main/resources/mapper/quot/QuotMapper.xml | 5 ++++- ruoyi-ui/src/api/quot/quot.js | 8 ++++++++ ruoyi-ui/src/views/quot/quot/index.vue | 12 ++++++++++-- 7 files changed, 56 insertions(+), 4 deletions(-) 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 29c1cc6..8d71279 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 @@ -935,7 +935,7 @@ public class QuotController extends BaseController } /** - * 报价组提交反馈 + * 保存反馈说明 */ @Log(title = "报价组-保存反馈说明", businessType = BusinessType.OTHER) @PostMapping("/saveQuotFeedbackExplanation") @@ -944,6 +944,16 @@ public class QuotController extends BaseController quotService.saveQuotFeedbackExplanation(quot); return success(); } + /** + * 保存报价员备注 + */ + @Log(title = "报价组-保存报价员备注", businessType = BusinessType.OTHER) + @PostMapping("/saveQuotBjyRemark") + public AjaxResult saveQuotBjyRemark(@RequestBody Quot quot) + { + quotService.saveQuotBjyRemark(quot); + return success(); + } /** diff --git a/ruoyi-system/src/main/java/com/ruoyi/quot/mapper/QuotMapper.java b/ruoyi-system/src/main/java/com/ruoyi/quot/mapper/QuotMapper.java index c75ce5c..a568c14 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/quot/mapper/QuotMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/quot/mapper/QuotMapper.java @@ -159,6 +159,12 @@ public interface QuotMapper */ void saveQuotFeedbackExplanation(Quot quot); + /** + * 报价组-保存报价员备注 + * @param quot + */ + void saveQuotBjyRemark(Quot quot); + /** * 根据该客户税号是否在客户单位表名单里-是否允许特批报价 是否是禁止 * @param tax @@ -193,4 +199,5 @@ public interface QuotMapper * @return */ String selectHandleTime(Quot quot); + } diff --git a/ruoyi-system/src/main/java/com/ruoyi/quot/service/IQuotService.java b/ruoyi-system/src/main/java/com/ruoyi/quot/service/IQuotService.java index 187def4..2702f1d 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/quot/service/IQuotService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/quot/service/IQuotService.java @@ -144,6 +144,12 @@ public interface IQuotService */ void saveQuotFeedbackExplanation(Quot quot); + /** + * 报价组-报价员备注 + * @param quot + */ + void saveQuotBjyRemark(Quot quot); + /** * 根据该客户税号是否在客户单位表名单里-是否允许特批报价 是否是禁止 * @param tax @@ -178,4 +184,5 @@ public interface IQuotService * @return */ String selectHandleTime(Quot quot); + } diff --git a/ruoyi-system/src/main/java/com/ruoyi/quot/service/impl/QuotServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/quot/service/impl/QuotServiceImpl.java index 76c5c20..5a48f40 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/quot/service/impl/QuotServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/quot/service/impl/QuotServiceImpl.java @@ -324,6 +324,15 @@ public class QuotServiceImpl implements IQuotService quotMapper.saveQuotFeedbackExplanation(quot); } + /** + * 报价组-保存报价员备注 + * @param quot + */ + @Override + public void saveQuotBjyRemark(Quot quot) { + quotMapper.saveQuotBjyRemark(quot); + } + /** * 根据该客户税号是否在客户单位表名单里-是否允许特批报价 是否是禁止 * @param tax diff --git a/ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml b/ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml index 0e29c4a..b8283db 100644 --- a/ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml @@ -171,7 +171,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" a.quot_quantity, a.quot_total_price, a.quot_check_user_name, u2.nick_name quot_check_user_nickname, a.quot_jsw_check_user_nickname,a.quot_bzr_user_nickname,a.quot_approval_status,a.quot_rbDateUid, a.quot_materials_count,a.quot_lv_price,a.quot_tong_price,a.quot_matprice_diff,a.quot_matprice_diff2,a.quot_print,a.quot_print_user_name,u3.nick_name quot_print_user_nickName, - a.create_by, a.create_time, a.update_by, a.update_time,a.quot_handle,a.quot_distinguish, + a.create_by, a.create_time, a.update_by, a.update_time,a.quot_handle,a.quot_distinguish,a.quot_bjy_remark, 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, @@ -553,6 +553,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update quot set quot_feedback_explanation = #{quotFeedbackExplanation} where quot_id = #{quotId} + + update quot set quot_bjy_remark = #{quotBjyRemark} where quot_id = #{quotId} + diff --git a/ruoyi-ui/src/api/quot/quot.js b/ruoyi-ui/src/api/quot/quot.js index 81702cf..bc6fd1f 100644 --- a/ruoyi-ui/src/api/quot/quot.js +++ b/ruoyi-ui/src/api/quot/quot.js @@ -171,6 +171,14 @@ export function saveQuotFeedbackExplanation(data) { data: data }) } +//保存报价员备注 +export function saveQuotBjyRemark(data) { + return request({ + url: '/quot/quot/saveQuotBjyRemark', + method: 'post', + data: data + }) +} //生成报价单-PC export function madeQuot(data) { diff --git a/ruoyi-ui/src/views/quot/quot/index.vue b/ruoyi-ui/src/views/quot/quot/index.vue index be3ca05..83733fd 100644 --- a/ruoyi-ui/src/views/quot/quot/index.vue +++ b/ruoyi-ui/src/views/quot/quot/index.vue @@ -429,7 +429,8 @@ - + + @@ -1082,7 +1083,7 @@ import { NumberAdd } from '@/utils/number';// 数值计算 import { toDecimal,versionList } from "@/api/redBook/redBook"; -import { changQuotPrintStatus,listQuot, getQuot, getReturnUpdateQuot,getAllPass,getAllReject, delQuot, addQuot, updateQuot, quotFileList, quotFileDelete, commitQuot, commitJsQuot, commitHjQuot, commitJswQuot, checkCustom, commitOAQuot, feedbackQuot, madeQuot, rejectQuot, setHandle,saveQuotFeedbackExplanation } from "@/api/quot/quot"; +import { changQuotPrintStatus,listQuot, getQuot, getReturnUpdateQuot,getAllPass,getAllReject, delQuot, addQuot, updateQuot, quotFileList, quotFileDelete, commitQuot, commitJsQuot, commitHjQuot, commitJswQuot, checkCustom, commitOAQuot, feedbackQuot, madeQuot, rejectQuot, setHandle,saveQuotFeedbackExplanation, saveQuotBjyRemark } from "@/api/quot/quot"; import { getToken } from "@/utils/auth"; import { checkPermi,checkRole } from '@/utils/permission';// 权限判断函数 import { getDicts } from "@/api/system/dict/data"; @@ -1659,6 +1660,13 @@ export default { this.$modal.msgSuccess("保存成功"); }); }, + // 保存报价员备注 + saveQuotBjyRemark(){ + const param = {'quotId':this.form.quotId,'quotBjyRemark':this.form.quotBjyRemark} + saveQuotBjyRemark(param).then(response => { + this.$modal.msgSuccess("保存成功"); + }); + }, /** 报价组生成报价单按钮 */ madeQuot(){