[fix] 客户报价

修复客户报价的业务主管审核、业务经理审核、总经理总助审核和驳回调整页面的是否含税报错问题。

ruoyi-admin/src/main/resources/templates/system/customerQuote/taskModifyApply.html

@@ -88,9 +88,9 @@
             <label class="col-sm-4 control-label is-required">是否含税：</label>
             <div class="col-sm-8">
                 <div class="radio-box" th:each="dict : ${@dict.getType('sys_confirm_tax')}">
-                    <input required type="radio" th:id="${'confirmFax_' + dict.dictCode}"
-                           name="confirmFax" th:value="${dict.dictValue}" th:checked="${dict.isDefault == 'Y' ? true : false}">
-                    <label th:for="${'confirmFax_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
+                    <input required type="radio" th:id="${'confirmTax_' + dict.dictCode}"
+                           name="confirmTax" th:value="${dict.dictValue}" th:checked="${dict.isDefault == 'Y' ? true : false}">
+                    <label th:for="${'confirmTax_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
                 </div>
             </div>
         </div>
@@ -192,11 +192,11 @@
     var prefix = ctx + "system/customerQuote"
     var commonCurrency = $("#commonCurrency_edit option:selected").val();
     var businessMembers = [[${formData.businessMembers}]];
-    var confirmFax = $("input[name='confirmFax']");
+    var confirmTax = $("input[name='confirmTax']");
     $("#form-customerQuote-modify").validate({ focusCleanup: true});
-    confirmFax.val([sysCustomerQuote.confirmFax]);
-    confirmFax.change(function () {
-        if ($("input[name='confirmFax']").val() == "1") {
+    confirmTax.val([sysCustomerQuote.confirmTax]);
+    confirmTax.change(function () {
+        if ($("input[name='confirmTax']").val() == "1") {
             $("input[name='rmbTax']").val(sysCustomerQuote.taxRate);
         } else {
             $("input[name='rmbTax']").val(0);

ruoyi-admin/src/main/resources/templates/system/customerQuote/taskYwjlVerify.html

@@ -83,9 +83,9 @@
             <label class="col-sm-6 control-label is-required">是否含税：</label>
             <div class="col-sm-6">
                 <div class="radio-box" th:each="dict : ${@dict.getType('sys_confirm_tax')}">
-                    <input required type="radio" th:id="${'confirmFax_' + dict.dictCode}"
-                           name="confirmFax" th:value="${dict.dictValue}" th:field="*{confirmFax}" th:checked="${dict.isDefault == 'Y' ? true : false}">
-                    <label th:for="${'confirmFax_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
+                    <input required type="radio" th:id="${'confirmTax_' + dict.dictCode}"
+                           name="confirmTax" th:value="${dict.dictValue}" th:field="*{confirmTax}" th:checked="${dict.isDefault == 'Y' ? true : false}">
+                    <label th:for="${'confirmTax_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
                 </div>
             </div>
         </div>

ruoyi-admin/src/main/resources/templates/system/customerQuote/taskYwzgVerify.html

@@ -84,9 +84,9 @@
             <label class="col-sm-6 control-label is-required">是否含税：</label>
             <div class="col-sm-6">
                 <div class="radio-box" th:each="dict : ${@dict.getType('sys_confirm_tax')}">
-                    <input required type="radio" th:id="${'confirmFax_' + dict.dictCode}"
-                           name="confirmFax" th:value="${dict.dictValue}" th:field="*{confirmFax}" th:checked="${dict.isDefault == 'Y' ? true : false}">
-                    <label th:for="${'confirmFax_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
+                    <input required type="radio" th:id="${'confirmTax_' + dict.dictCode}"
+                           name="confirmTax" th:value="${dict.dictValue}" th:field="*{confirmTax}" th:checked="${dict.isDefault == 'Y' ? true : false}">
+                    <label th:for="${'confirmTax_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
                 </div>
             </div>
         </div>
@@ -207,11 +207,11 @@
                 }
             }
         });
-        var confirmFax = $("input[name='confirmFax']");
-        confirmFax.val([sysCustomerQuote.confirmFax]);
+        var confirmTax = $("input[name='confirmTax']");
+        confirmTax.val([sysCustomerQuote.confirmTax]);
         $("input[name='rmbTax']").val([sysCustomerQuote.taxRate]);
-        confirmFax.change(function () {
-            if ($("input[name='confirmFax']").val() == "1") {
+        confirmTax.change(function () {
+            if ($("input[name='confirmTax']").val() == "1") {
                 $("input[name='rmbTax']").val(sysCustomerQuote.taxRate);
             } else {
                 $("input[name='rmbTax']").val(0);

ruoyi-admin/src/main/resources/templates/system/customerQuote/taskZozjVerify.html

@@ -86,9 +86,9 @@
             <label class="col-sm-6 control-label is-required">是否含税：</label>
             <div class="col-sm-6">
                 <div class="radio-box" th:each="dict : ${@dict.getType('sys_confirm_tax')}">
-                    <input type="radio" th:id="${'confirmFax_' + dict.dictCode}" th:field="*{confirmFax}"
-                           name="confirmFax" th:value="${dict.dictValue}"  required>
-                    <label th:for="${'confirmFax_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
+                    <input type="radio" th:id="${'confirmTax_' + dict.dictCode}" th:field="*{confirmTax}"
+                           name="confirmTax" th:value="${dict.dictValue}"  required>
+                    <label th:for="${'confirmTax_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
                 </div>
             </div>
         </div>