From df2b17ebca11ee77c6cca21ef8ae27044416be1e Mon Sep 17 00:00:00 2001 From: xd <844539747@qq.com> Date: Tue, 18 Jun 2024 11:58:52 +0800 Subject: [PATCH] '123' --- .../main/java/com/ruoyi/quot/domain/Quot.java | 7 ++- .../main/resources/mapper/quot/QuotMapper.xml | 6 +- ruoyi-ui/src/directive/dialog/dragDialog.js | 2 +- ruoyi-ui/src/views/quot/quot/index.vue | 15 ++--- .../statisticsQuot/statisticsQuot/index.vue | 55 ++++++++++++++++--- 5 files changed, 65 insertions(+), 20 deletions(-) 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 d6b3daa..c14c84c 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 @@ -96,8 +96,10 @@ public class Quot extends BaseEntity /** 是否打印 */ private String quotPrint; - /** 打印人 */ + /** 打印人账号 */ private String quotPrintUserName; + /** 打印人 */ + private String quotPrintUserNickName; /** 总价 */ private String quotTotalPrice; @@ -309,6 +311,9 @@ public class Quot extends BaseEntity public String getQuotPrintUserName() { return quotPrintUserName; } public void setQuotPrintUserName(String quotPrintUserName) { this.quotPrintUserName = quotPrintUserName; } + public String getQuotPrintUserNickName() { return quotPrintUserNickName; } + + public void setQuotPrintUserNickName(String quotPrintUserNickName) { this.quotPrintUserNickName = quotPrintUserNickName; } public void setQuotQuantity(String quotQuantity) { this.quotQuantity = quotQuantity; diff --git a/ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml b/ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml index 43b5a4c..d82c02c 100644 --- a/ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml @@ -35,6 +35,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + @@ -111,7 +113,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" a.quot_phone, a.quot_inquiry_date, 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, u2.nick_name quot_check_user_nickname, a.quot_approval_status,a.quot_materials_count, - a.quot_lv_price,a.quot_tong_price,a.quot_matprice_diff,a.quot_print,u3.nick_name quot_print_user_name, + a.quot_lv_price,a.quot_tong_price,a.quot_matprice_diff,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, u.nick_name create_name, a.quot_jsxz_standard,a.quot_jsxz_approval_status,a.quot_jsxz_chapter, @@ -156,7 +158,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" a.quot_salesman_dept_id, a.quot_salesman_dept_name, a.quot_address, a.quot_contacts, a.quot_phone, a.quot_inquiry_date, 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, u2.nick_name quot_check_user_nickname, a.quot_approval_status, - a.quot_materials_count,a.quot_lv_price,a.quot_tong_price,a.quot_matprice_diff,a.quot_print,u3.nick_name quot_print_user_name, + a.quot_materials_count,a.quot_lv_price,a.quot_tong_price,a.quot_matprice_diff,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_jsxz_standard,a.quot_jsxz_approval_status,a.quot_jsxz_chapter, diff --git a/ruoyi-ui/src/directive/dialog/dragDialog.js b/ruoyi-ui/src/directive/dialog/dragDialog.js index 37d24ae..aef2197 100644 --- a/ruoyi-ui/src/directive/dialog/dragDialog.js +++ b/ruoyi-ui/src/directive/dialog/dragDialog.js @@ -107,7 +107,7 @@ export default { dialogHeaderEl.onmousedown = null; if (!hasSetBodyHight) { let footerHeight = dragDom.querySelector('.el-dialog__footer') && dragDom.querySelector('.el-dialog__footer').offsetHeight; - dragDom.querySelector('.el-dialog__body').style.height = 'calc(100% - ' + (dialogHeaderEl.offsetHeight + footerHeight) + 'px)'; + dragDom.querySelector('.el-dialog__body').style.height = 'calc(100% - 110px)'; dragDom.querySelector('.el-dialog__body').style.maxHeight = dragDom.style.height hasSetBodyHight = true; } diff --git a/ruoyi-ui/src/views/quot/quot/index.vue b/ruoyi-ui/src/views/quot/quot/index.vue index 17f52f2..2701ac4 100644 --- a/ruoyi-ui/src/views/quot/quot/index.vue +++ b/ruoyi-ui/src/views/quot/quot/index.vue @@ -1,10 +1,10 @@ - + @@ -256,7 +256,7 @@ 报价信息 - + @@ -362,8 +362,8 @@ - - + + @@ -1232,6 +1232,7 @@ export default { quotApprovalStatus: null, quotPrintUserName: null, + quotPrintUserNickName: null, quotMaterialsCount: null, quotTongPrice: null, quotLvPrice: null, diff --git a/ruoyi-ui/src/views/statisticsQuot/statisticsQuot/index.vue b/ruoyi-ui/src/views/statisticsQuot/statisticsQuot/index.vue index 631e208..2d30504 100644 --- a/ruoyi-ui/src/views/statisticsQuot/statisticsQuot/index.vue +++ b/ruoyi-ui/src/views/statisticsQuot/statisticsQuot/index.vue @@ -38,17 +38,21 @@ 重置 + + + 总条数:{{sumQuotMaterialsCount}} + + + 总价:{{sumQuotTotalPrice}} + + - - - - + + - +