From 5665d2b633fcc9488ecfcdd755b75ba82eb871e0 Mon Sep 17 00:00:00 2001 From: xd <844539747@qq.com> Date: Thu, 6 Jun 2024 10:12:38 +0800 Subject: [PATCH] '123' --- .../main/resources/mapper/quot/QuotMapper.xml | 3 + ruoyi-ui/src/views/quot/quot/index.vue | 102 ++++++++++++------ 2 files changed, 75 insertions(+), 30 deletions(-) diff --git a/ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml b/ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml index 8ef92c8..0b7eade 100644 --- a/ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml @@ -85,6 +85,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -175,6 +176,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" b.mat_matprice as sub_mat_matprice, b.mat_price as sub_mat_price, b.mat_quot_price as sub_mat_quot_price, + + b.mat_quot_tp as sub_mat_quot_tp, b.mat_quot_allPrice as sub_mat_quot_allPrice, b.mat_matprice_diff as sub_mat_matprice_diff, diff --git a/ruoyi-ui/src/views/quot/quot/index.vue b/ruoyi-ui/src/views/quot/quot/index.vue index aaaf820..083440e 100644 --- a/ruoyi-ui/src/views/quot/quot/index.vue +++ b/ruoyi-ui/src/views/quot/quot/index.vue @@ -121,6 +121,7 @@ + - + 当前协助情况 @@ -305,37 +306,53 @@
- + - + - -
-
- - + - + + + + - +
+ + + + + + + + + + + + + + + + + @@ -399,17 +416,17 @@ - + - + - + @@ -419,26 +436,46 @@ - + - - - - - - - + + + + + + + + + + + + + + + + + + + 清单附件(先保存再上传且必须是EXCEL文件) @@ -1122,6 +1159,11 @@ export default { quotOAApprovalStatusRemark: null, quotApprovalStatus: null, + quotPrintUserName: null, + quotTongPrice: null, + quotLvPrice: null, + quotMatpriceDiff: null, + quotJsxzApprovalStatus: null, quotJsxzChapter: null, quotJsxzConfirmCode: null,