From 9cec469f7cf4ad50033d04d53c8b3fe900095dd6 Mon Sep 17 00:00:00 2001
From: liuxiaoxu <1793812695@qq.com>
Date: Wed, 12 Jun 2024 10:30:17 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=E9=94=80=E5=94=AE=E7=AE=A1=E7=90=86:=20?=
 =?UTF-8?q?=E5=AE=A2=E6=88=B7=E6=8A=A5=E4=BB=B7=20=E5=89=8D=E7=AB=AF?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=A1=B5=E9=9D=A2=20=E6=B7=BB=E5=8A=A0=20?=
 =?UTF-8?q?=E8=AE=A1=E7=AE=97=E7=9B=B8=E5=85=B3=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/system/customerQuote/add.html   | 44 +++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/ruoyi-admin/src/main/resources/templates/system/customerQuote/add.html b/ruoyi-admin/src/main/resources/templates/system/customerQuote/add.html
index 134cc63b..f81c34f4 100644
--- a/ruoyi-admin/src/main/resources/templates/system/customerQuote/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/customerQuote/add.html
@@ -89,7 +89,34 @@
                     <textarea name="remark" class="form-control"  readonly></textarea>
                 </div>
             </div>
+
+            <div class="container">
+                <h4 class="form-header h4">计算</h4>
+                <div class="col-xs-12 form-row">
+                    <label class=" col-sm-2">物料合计：</label><input class="col-sm-4" name="enterprise" id="enterprise_edit" type="text" readonly/>
+                    <label class=" col-sm-2">数量合计：</label><input class="col-sm-4" name="enterpriseSum" id="enterpriseSum_edit" type="number" readonly/>
+                </div>
+                <div class="col-xs-12 form-row">
+                    <label class="col-sm-2"> 不含税单价：</label><input placeholder="RMB" class="col-sm-4" name="noRmb" id="noRmb_edit" type="number" readonly/>
+                    <label class="col-sm-2"> 不含税总价：</label><input placeholder="RMB" class="col-sm-4" name="noRmbSum" id="noRmbSum_edit" type="number" readonly/>
+                </div>
+                <div class="col-xs-12 form-row">
+                    <label class="col-sm-2"> 含税单价：</label><input placeholder="RMB" class="col-sm-4" name="rmb" id="rmb_edit" type="number" readonly/>
+                    <label class="col-sm-2"> 含税总价：</label><input placeholder="RMB" class="col-sm-4" name="rmbSum" id="rmbSum_edit" type="number" readonly/>
+                </div>
+                <div class="col-xs-12">
+                    <label class="col-sm-2">不含税单价：</label><input placeholder="美元" class="col-sm-4" name="noUsd" id="noUsd_edit" type="number" readonly/>
+                    <label class="col-sm-2">不含税总价：</label><input placeholder="美元" class="col-sm-4" name="noUsdSum" id="noUsdSum_edit" type="number" readonly/>
+                </div>
+                <div class="col-xs-12">
+                    <label class="col-sm-2">含税单价：</label><input placeholder="美元" class="col-sm-4" name="usd" id="usd_edit" type="number" readonly/>
+                    <label class="col-sm-2">含税总价：</label><input placeholder="美元" class="col-sm-4" name="usdSum" id="usdSum_edit" type="number" readonly/>
+                </div>
+            </div>
+
         </form>
+
+
         <div class="container">
             <div class="form-row">
                 <div class="btn-group-sm" id="toolbar" role="group">
@@ -287,6 +314,23 @@
                             }
                         }
                     },
+
+                    { title: '最新报价',field: 'materialSole',
+                        editable: {
+                            type: 'number',
+                            mode: 'inline',
+                            title: '对外售价',
+                            validate: function (value) {
+                                if (!value) {
+                                    return '对外售价不能为空';
+                                }
+                                if (isNaN(value)) {
+                                    return '对外售价必须为数字';
+                                }
+                            }
+                        }
+                    },
+
                     {title: '国内税率',field: 'countTax',align: 'center',},
                     { title: '美元汇率',field: 'usdTax', align: 'center',},
                     {field: 'materialNum',align: 'center',title: '物料的数量',