修复：客户报价重新申请审核页面，审核页面重新获取修改后的客户报价物料信息。

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",

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",

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();
+        getTotalAmount();
-        $("#enterpriseSum_edit").val((enterpriseSum==null?0:enterpriseSum) - rowData.materialNum);
     }
     $("input[name='pricingDate']").datetimepicker({
         format: "yyyy-mm-dd",

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",

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({
+    $("#form-customerQuote-ywzg").validate({focusCleanup: true});
-        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",

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},