From c4b1c555556eefc7b9b9ad4de8bef662934fc02f Mon Sep 17 00:00:00 2001
From: zhangsiqi <2825463979@qq.com>
Date: Tue, 9 Jul 2024 21:07:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E5=AE=A2=E6=88=B7?=
 =?UTF-8?q?=E6=8A=A5=E4=BB=B7=E9=87=8D=E6=96=B0=E7=94=B3=E8=AF=B7=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E9=A1=B5=E9=9D=A2=EF=BC=8C=E5=AE=A1=E6=A0=B8=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E9=87=8D=E6=96=B0=E8=8E=B7=E5=8F=96=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=90=8E=E7=9A=84=E5=AE=A2=E6=88=B7=E6=8A=A5=E4=BB=B7=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E4=BF=A1=E6=81=AF=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/system/customerQuote/add.html          | 12 +++++++++++-
 .../templates/system/customerQuote/edit.html         |  3 ++-
 .../system/customerQuote/taskModifyApply.html        |  5 ++---
 .../system/customerQuote/taskYwjlVerify.html         |  1 +
 .../system/customerQuote/taskYwzgVerify.html         |  7 +++----
 .../system/customerQuote/taskZozjVerify.html         |  2 +-
 6 files changed, 20 insertions(+), 10 deletions(-)

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 f1d7d1b1..2a1da822 100644
--- a/ruoyi-admin/src/main/resources/templates/system/customerQuote/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/customerQuote/add.html
@@ -589,6 +589,15 @@
             var iframeWin = window[layero.find('iframe')[0]['name']];
             var rowData = iframeWin.$('#bootstrap-select-table').bootstrapTable('getSelections')[0];
             console.log("rowData:   "+rowData);
+            //判断是否重复
+            var rows = $("#bootstrap-sub-table-1").bootstrapTable('getData').length;
+            for(var i=0;i<rows;i++){
+                var data = $("#bootstrap-sub-table-1").bootstrapTable('getData')[i];
+                if(data.materialNo==rowData.materialCode){
+                    $.modal.alertError("不能选择已添加过的相同料号");
+                    return;
+                }
+            }
             $("#bootstrap-sub-table-quoteChild").bootstrapTable('insertRow', {
                 index:1,
                 row: {
@@ -652,7 +661,8 @@
             $("#bootstrap-sub-table-quoteChild").bootstrapTable('remove', {
                 field: 'materialCode',
                 values: materialCode
-            })
+            });
+            getTotalAmount();
         }
         $("input[name='pricingDate']").datetimepicker({
             format: "yyyy-mm-dd",
diff --git a/ruoyi-admin/src/main/resources/templates/system/customerQuote/edit.html b/ruoyi-admin/src/main/resources/templates/system/customerQuote/edit.html
index fd3e564f..79b379e2 100644
--- a/ruoyi-admin/src/main/resources/templates/system/customerQuote/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/system/customerQuote/edit.html
@@ -455,7 +455,8 @@
         $.table.bootstrapTable('remove', {
             field: 'id',
             values: rowData.id
-        })
+        });
+        getTotalAmount();
     }
     $("input[name='pricingDate']").datetimepicker({
         format: "yyyy-mm-dd",
diff --git a/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskModifyApply.html b/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskModifyApply.html
index 71235598..2b926b94 100644
--- a/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskModifyApply.html
+++ b/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskModifyApply.html
@@ -492,9 +492,8 @@
         $.table.bootstrapTable('remove', {
             field: 'id',
             values: rowData.id
-        })
-        let enterpriseSum = $("#enterpriseSum_edit").val();
-        $("#enterpriseSum_edit").val((enterpriseSum==null?0:enterpriseSum) - rowData.materialNum);
+        });
+        getTotalAmount();
     }
     $("input[name='pricingDate']").datetimepicker({
         format: "yyyy-mm-dd",
diff --git a/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskYwjlVerify.html b/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskYwjlVerify.html
index 5308a760..e1d261e9 100644
--- a/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskYwjlVerify.html
+++ b/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskYwjlVerify.html
@@ -477,6 +477,7 @@
             field: 'id',
             values: rowData.id
         })
+        getTotalAmount();
     }
     $("input[name='pricingDate']").datetimepicker({
         format: "yyyy-mm-dd",
diff --git a/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskYwzgVerify.html b/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskYwzgVerify.html
index a3f3401c..3b798fe9 100644
--- a/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskYwzgVerify.html
+++ b/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskYwzgVerify.html
@@ -188,9 +188,7 @@
     var sysCustomerQuote = [[${formData}]];
     var prefix = ctx + "system/customerQuote"
     var commonCurrency = $("#commonCurrency_edit option:selected").val();
-    $("#form-customerQuote-ywzg").validate({
-        focusCleanup: true,
-    });
+    $("#form-customerQuote-ywzg").validate({focusCleanup: true});
     $(function() {
         /*业务员列表*/
         $.ajax({
@@ -476,7 +474,8 @@
         $.table.bootstrapTable('remove', {
             field: 'id',
             values: rowData.id
-        })
+        });
+        getTotalAmount();
     }
     $("input[name='pricingDate']").datetimepicker({
         format: "yyyy-mm-dd",
diff --git a/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskZozjVerify.html b/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskZozjVerify.html
index 5126ce41..56abf0c9 100644
--- a/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskZozjVerify.html
+++ b/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskZozjVerify.html
@@ -236,7 +236,7 @@
                 {checkbox: true},
                 {title: '序号',align: 'center',
                     formatter: function (value, row, index) {
-                        return $.table.serialNumber(index);
+                        return $.table.serialNumber(index + 1);
                     }
                 },
                 {title: '报价子表id',field: 'id',align: 'center',visible: false},