diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysCustomerQuoteController.java b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysCustomerQuoteController.java index e9d32d08..03669c49 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysCustomerQuoteController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysCustomerQuoteController.java @@ -152,7 +152,6 @@ public class SysCustomerQuoteController extends BaseController @ResponseBody public AjaxResult addSave(@RequestBody SysCustomerQuote sysCustomerQuote) { - System.out.println("SysCustomerQuoteController.addSave:" + sysCustomerQuote.toString()); sysCustomerQuote.setAuditStatus("0"); sysCustomerQuote.setUseStatus("0"); sysCustomerQuoteService.submitApply(sysCustomerQuote); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysCustomerQuote.java b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysCustomerQuote.java index f10a8c6e..6523fa7c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysCustomerQuote.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysCustomerQuote.java @@ -52,7 +52,7 @@ public class SysCustomerQuote extends BaseEntity @Excel(name = "报价币种") private String commonCurrency; /*是否含税*/ - private String confirmFax; + private String confirmTax; /** 国内汇率 */ @Excel(name = "国内汇率") private BigDecimal rmbTax; @@ -107,12 +107,13 @@ public class SysCustomerQuote extends BaseEntity private String restoreInstanceId; private List sysCustomerQuoteChildList; - public String getConfirmFax() { - return confirmFax; + + public String getConfirmTax() { + return confirmTax; } - public void setConfirmFax(String confirmFax) { - this.confirmFax = confirmFax; + public void setConfirmTax(String confirmTax) { + this.confirmTax = confirmTax; } public String getAuditStatus() { @@ -390,7 +391,7 @@ public class SysCustomerQuote extends BaseEntity .append("enterpriseSum", getEnterpriseSum()) .append("commonCurrency", getCommonCurrency()) .append("usdTax", getUsdTax()) - .append("confirmFax", getConfirmFax()) + .append("confirmTax", getConfirmTax()) .append("noRmbSum", getNoRmbSum()) .append("rmbTax", getRmbTax()) .append("rmbSum", getRmbSum()) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerQuoteServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerQuoteServiceImpl.java index 3faf4d06..76f75be9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerQuoteServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerQuoteServiceImpl.java @@ -300,7 +300,6 @@ public class SysCustomerQuoteServiceImpl implements ISysCustomerQuoteService { if(sysCustomerQuote.getId()==null){ insertSysCustomerQuote(sysCustomerQuote); } - System.out.println("sysCustomerQuote:"+sysCustomerQuote); // 启动流程 String applyTitle = user.getUserName()+"发起了客户报价信息提交审批-"+DateUtils.dateTimeNow(); String instanceType = "submit"; diff --git a/ruoyi-admin/src/main/resources/mapper/system/SysCustomerQuoteMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/SysCustomerQuoteMapper.xml index 88ed9b20..ac97e002 100644 --- a/ruoyi-admin/src/main/resources/mapper/system/SysCustomerQuoteMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/system/SysCustomerQuoteMapper.xml @@ -13,7 +13,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -48,7 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select id,supplierCode,customerCode,customerName,pricingDate,enterprise,enterpriseSum,common_currency, - confirm_fax,rmbTax,usdTax,noRmb,noRmbSum,rmb,rmbSum,noUsd,noUsdSum,usd,usdSum,business_members, + confirm_tax,rmbTax,usdTax,noRmb,noRmbSum,rmb,rmbSum,noUsd,noUsdSum,usd,usdSum,business_members, degin_flag,del_flag,create_by,create_time,update_by,update_time,remark,audit_status,use_status, instance_id,instance_type,submit_instance_id,cancel_instance_id,restore_instance_id,apply_title,apply_user,apply_time,del_flag from sys_customer_quote @@ -56,7 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -55,14 +56,30 @@ + + + + + + + + + +
-
- - +
+ +
+ +
+
+ +
+ + @@ -198,13 +215,20 @@ $('input[name="customerName"]').val(data.data.customerName); $("input[name='rmbTax']").val(data.data.taxRate); // 根据data.data.confirmTax的值（0或1）来选中对应的单选按钮 - if(data.data.confirmTax === '0' || data.data.confirmTax === '1') { - console.log("data.data.confirmTax:",data.data.confirmTax) - $('input:radio[name="confirmTax"][value="' + data.data.confirmTax + '"]').attr('checked', "checked"); - } else { - // 如果返回的值不是预期的0或1，可处理异常情况 - console.warn("Unexpected confirmTax value:", data.data.confirmTax); + // if(data.data.confirmTax === '0' || data.data.confirmTax === '1') { + // console.log("data.data.confirmTax:",data.data.confirmTax) + // $('input:radio[name="confirmTax"][value="' + data.data.confirmTax + '"]').attr('checked', "checked"); + // } else { + // // 如果返回的值不是预期的0或1，可处理异常情况 + // console.warn("Unexpected confirmTax value:", data.data.confirmTax); + // } + + if (data.data.commonCurrency == '1'){ + $('input:radio[name="confirmTax"][value="1"]').prop('checked', true); + }else { + $('input:radio[name="confirmTax"][value="0"]').prop('checked', true); } + $("#commonCurrency_add").val(data.data.commonCurrency).trigger('change'); commonCurrency = $("#commonCurrency_add option:selected").val(); }, @@ -281,7 +305,11 @@ var options = { id:'bootstrap-sub-table-quoteChild', // url: ctx + "system/quoteChild/list", + showColumns: false, pagination: false, + showToggle: false, + showRefresh:false, + showSearch:false, sidePagination: "client", model: "物料报价信息", columns: [ @@ -554,6 +582,8 @@ // getBusinessMembers(); getCustomerCode(); }); + + //监听币种的变化 $(document).ready(function() { $("#commonCurrency_add").on('change', function() { var selectedValue = $(this).val(); @@ -563,13 +593,13 @@ if(selectedValue ==="1"){ console.log("1:"+selectedValue); $radioNo.removeAttr('checked'); - $radioTax.attr('checked','checked'); + $radioTax.prop('checked','checked'); // $("input[name='confirmFax']").val(1); console.log($radioTax.prop('checked')); }else if(selectedValue ==="2"){ console.log("2:"+selectedValue); - $radioTax.prop('checked',false); + $radioTax.removeAttr('checked',false); $radioNo.prop('checked',true); // $radioTax.removeAttr('checked'); // $radioNo.attr('checked','checked'); diff --git a/ruoyi-admin/src/main/resources/templates/system/customerQuote/customerQuote.html b/ruoyi-admin/src/main/resources/templates/system/customerQuote/customerQuote.html index 984bb0d2..e62927c6 100644 --- a/ruoyi-admin/src/main/resources/templates/system/customerQuote/customerQuote.html +++ b/ruoyi-admin/src/main/resources/templates/system/customerQuote/customerQuote.html @@ -72,7 +72,7 @@
-
+
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 c16e5b5f..c05bec87 100644 --- a/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskModifyApply.html +++ b/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskModifyApply.html @@ -88,9 +88,9 @@
- - + +
@@ -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); 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 b2b8310a..5dd38701 100644 --- a/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskYwjlVerify.html +++ b/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskYwjlVerify.html @@ -83,9 +83,9 @@
- - + +
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 061674a6..29516208 100644 --- a/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskYwzgVerify.html +++ b/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskYwzgVerify.html @@ -84,9 +84,9 @@
- - + +
@@ -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); 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 75ec7cf9..6d9cd005 100644 --- a/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskZozjVerify.html +++ b/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskZozjVerify.html @@ -86,9 +86,9 @@
- - + +