diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 841fcf1..ba126cc 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,86 +2,13 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -207,65 +136,65 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + 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 14ac12c..9ea4ce5 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 @@ -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-admin/target/classes/com/ruoyi/web/controller/quot/QuotController.class b/ruoyi-admin/target/classes/com/ruoyi/web/controller/quot/QuotController.class index d9eff33..2027c8c 100644 Binary files a/ruoyi-admin/target/classes/com/ruoyi/web/controller/quot/QuotController.class and b/ruoyi-admin/target/classes/com/ruoyi/web/controller/quot/QuotController.class differ diff --git a/ruoyi-admin/target/maven-archiver/pom.properties b/ruoyi-admin/target/maven-archiver/pom.properties index 2181f38..5d9f12d 100644 --- a/ruoyi-admin/target/maven-archiver/pom.properties +++ b/ruoyi-admin/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Fri Aug 09 14:20:44 CST 2024 +#Fri Aug 09 15:34:59 CST 2024 version=3.8.7 groupId=com.ruoyi artifactId=ruoyi-admin diff --git a/ruoyi-admin/target/ruoyi-admin.jar b/ruoyi-admin/target/ruoyi-admin.jar index e994111..b6ac37f 100644 Binary files a/ruoyi-admin/target/ruoyi-admin.jar and b/ruoyi-admin/target/ruoyi-admin.jar differ diff --git a/ruoyi-admin/target/ruoyi-admin.jar.original b/ruoyi-admin/target/ruoyi-admin.jar.original index 788e727..2086716 100644 Binary files a/ruoyi-admin/target/ruoyi-admin.jar.original and b/ruoyi-admin/target/ruoyi-admin.jar.original differ diff --git a/ruoyi-common/target/maven-archiver/pom.properties b/ruoyi-common/target/maven-archiver/pom.properties index 0c3b908..7908d5c 100644 --- a/ruoyi-common/target/maven-archiver/pom.properties +++ b/ruoyi-common/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Fri Aug 09 14:20:29 CST 2024 +#Fri Aug 09 15:34:09 CST 2024 version=3.8.7 groupId=com.ruoyi artifactId=ruoyi-common diff --git a/ruoyi-common/target/ruoyi-common-3.8.7.jar b/ruoyi-common/target/ruoyi-common-3.8.7.jar index 48212a8..393b86a 100644 Binary files a/ruoyi-common/target/ruoyi-common-3.8.7.jar and b/ruoyi-common/target/ruoyi-common-3.8.7.jar differ diff --git a/ruoyi-framework/target/maven-archiver/pom.properties b/ruoyi-framework/target/maven-archiver/pom.properties index dd4eda5..62bb4f7 100644 --- a/ruoyi-framework/target/maven-archiver/pom.properties +++ b/ruoyi-framework/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Fri Aug 09 14:20:36 CST 2024 +#Fri Aug 09 15:34:31 CST 2024 version=3.8.7 groupId=com.ruoyi artifactId=ruoyi-framework diff --git a/ruoyi-framework/target/ruoyi-framework-3.8.7.jar b/ruoyi-framework/target/ruoyi-framework-3.8.7.jar index 95c3897..db93e24 100644 Binary files a/ruoyi-framework/target/ruoyi-framework-3.8.7.jar and b/ruoyi-framework/target/ruoyi-framework-3.8.7.jar differ diff --git a/ruoyi-generator/target/maven-archiver/pom.properties b/ruoyi-generator/target/maven-archiver/pom.properties index 7737f21..d1a568f 100644 --- a/ruoyi-generator/target/maven-archiver/pom.properties +++ b/ruoyi-generator/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Fri Aug 09 14:20:38 CST 2024 +#Fri Aug 09 15:34:43 CST 2024 version=3.8.7 groupId=com.ruoyi artifactId=ruoyi-generator diff --git a/ruoyi-generator/target/ruoyi-generator-3.8.7.jar b/ruoyi-generator/target/ruoyi-generator-3.8.7.jar index 9724cdf..b4363c6 100644 Binary files a/ruoyi-generator/target/ruoyi-generator-3.8.7.jar and b/ruoyi-generator/target/ruoyi-generator-3.8.7.jar differ diff --git a/ruoyi-quartz/target/maven-archiver/pom.properties b/ruoyi-quartz/target/maven-archiver/pom.properties index 5f6bc4b..7c73da2 100644 --- a/ruoyi-quartz/target/maven-archiver/pom.properties +++ b/ruoyi-quartz/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Fri Aug 09 14:20:38 CST 2024 +#Fri Aug 09 15:34:37 CST 2024 version=3.8.7 groupId=com.ruoyi artifactId=ruoyi-quartz diff --git a/ruoyi-quartz/target/ruoyi-quartz-3.8.7.jar b/ruoyi-quartz/target/ruoyi-quartz-3.8.7.jar index 5021bbf..e0d749f 100644 Binary files a/ruoyi-quartz/target/ruoyi-quartz-3.8.7.jar and b/ruoyi-quartz/target/ruoyi-quartz-3.8.7.jar differ 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 6ddce24..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 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 60a3a1d..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 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 fe55491..daf5e9b 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 d05b7a2..1428e45 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, @@ -554,7 +554,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-system/target/maven-archiver/pom.properties b/ruoyi-system/target/maven-archiver/pom.properties index 666ca23..55ca070 100644 --- a/ruoyi-system/target/maven-archiver/pom.properties +++ b/ruoyi-system/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Fri Aug 09 14:20:32 CST 2024 +#Fri Aug 09 15:34:17 CST 2024 version=3.8.7 groupId=com.ruoyi artifactId=ruoyi-system diff --git a/ruoyi-system/target/ruoyi-system-3.8.7.jar b/ruoyi-system/target/ruoyi-system-3.8.7.jar index 5665785..23a893f 100644 Binary files a/ruoyi-system/target/ruoyi-system-3.8.7.jar and b/ruoyi-system/target/ruoyi-system-3.8.7.jar differ diff --git a/ruoyi-ui/src/api/quot/quot.js b/ruoyi-ui/src/api/quot/quot.js index 81702cf..e87b7f3 100644 --- a/ruoyi-ui/src/api/quot/quot.js +++ b/ruoyi-ui/src/api/quot/quot.js @@ -172,6 +172,15 @@ export function saveQuotFeedbackExplanation(data) { }) } +//保存报价员备注 +export function saveQuotBjyRemark(data) { + return request({ + url: '/quot/quot/saveQuotBjyRemark', + method: 'post', + data: data + }) +} + //生成报价单-PC export function madeQuot(data) { return request({ diff --git a/ruoyi-ui/src/views/quot/quot/index.vue b/ruoyi-ui/src/views/quot/quot/index.vue index be3ca05..def75e5 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"; @@ -1660,6 +1661,14 @@ export default { }); }, + // 保存报价员备注 + saveQuotBjyRemark(){ + const param = {'quotId':this.form.quotId,'quotBjyRemark':this.form.quotBjyRemark} + saveQuotBjyRemark(param).then(response => { + this.$modal.msgSuccess("保存成功"); + }); + }, + /** 报价组生成报价单按钮 */ madeQuot(){ const roles = this.$store.state.user.roles;