From 2793e8e2b7dec3d7ebb6d16ef7fe744ebd593926 Mon Sep 17 00:00:00 2001 From: xd <844539747@qq.com> Date: Thu, 18 Apr 2024 10:52:13 +0800 Subject: [PATCH] '123' --- .../main/resources/mapper/quot/QuotMapper.xml | 58 +++++++++++++++++-- .../priceVerification/index.vue | 16 ++++- ruoyi-ui/src/views/quot/quot/index.vue | 29 +++++++--- .../technicalConfirm/index.vue | 2 +- 4 files changed, 87 insertions(+), 18 deletions(-) diff --git a/ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml b/ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml index f3603a4..2269d19 100644 --- a/ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml @@ -289,14 +289,60 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + select a.quot_id, a.quot_code, a.quot_salesman_bm, a.quot_salesman_name, a.quot_customer_name, + a.quot_salesman_dept_id, a.quot_salesman_dept_name, a.quot_address, 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.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, + 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 + from quot a + left join quot_material b on b.quot_id = a.quot_id + + where a.quot_jsxz_confirm_id = #{quotJsqrId} - + select a.quot_id, a.quot_code, a.quot_salesman_bm, a.quot_salesman_name, a.quot_customer_name, + a.quot_salesman_dept_id, a.quot_salesman_dept_name, a.quot_address, 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.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, + 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 + from quot a + left join quot_material b on b.quot_id = a.quot_id + + where a.quot_ht_id = #{quotHjId} diff --git a/ruoyi-ui/src/views/priceVerification/priceVerification/index.vue b/ruoyi-ui/src/views/priceVerification/priceVerification/index.vue index 3e8b123..5e7417b 100644 --- a/ruoyi-ui/src/views/priceVerification/priceVerification/index.vue +++ b/ruoyi-ui/src/views/priceVerification/priceVerification/index.vue @@ -87,7 +87,15 @@ - +
+ + +
@@ -188,6 +196,10 @@ height: 550px; max-height: 580px; /* 设置最大高度，根据需要调整 */ } + + :deep(.el-p .el-input__wrapper){ + width: 100% !important; + }