Browse Source

[fix] 销售管理

按照万材要求,调整客户报价的新增页面、详情页面、修改页面、驳回调整页面、业务经理审核页面、业务主管审核页面、总经理总助审核页面的计算整个模块进行去除
按照万材要求,调整客户报价新增页面的含税不含税,通过币种设置含税不含税后,进行固定操作,不能在选择含税不含税;调整后端代码通过币种设置含税不含税
调整客户报价详情页面的含税不含税字段的样式布局
dev
liuxiaoxu 2 weeks ago
parent
commit
a3188e7ab6
  1. 6
      ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerQuoteServiceImpl.java
  2. 6
      ruoyi-admin/src/main/resources/templates/system/customerQuote/add.html
  3. 8
      ruoyi-admin/src/main/resources/templates/system/customerQuote/detail.html
  4. 2
      ruoyi-admin/src/main/resources/templates/system/customerQuote/edit.html
  5. 2
      ruoyi-admin/src/main/resources/templates/system/customerQuote/taskModifyApply.html
  6. 2
      ruoyi-admin/src/main/resources/templates/system/customerQuote/taskYwjlVerify.html
  7. 2
      ruoyi-admin/src/main/resources/templates/system/customerQuote/taskYwzgVerify.html
  8. 2
      ruoyi-admin/src/main/resources/templates/system/customerQuote/taskZozjVerify.html

6
ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerQuoteServiceImpl.java

@ -189,6 +189,12 @@ public class SysCustomerQuoteServiceImpl implements ISysCustomerQuoteService {
String loginName = ShiroUtils.getLoginName();
sysCustomerQuote.setCreateBy(loginName);
sysCustomerQuote.setCreateTime(DateUtils.getNowDate());
String commonCurrency = sysCustomerQuote.getCommonCurrency();
if (RMB.equals(commonCurrency)){
sysCustomerQuote.setConfirmTax("1");
}else {
sysCustomerQuote.setConfirmTax("0");
}
int result = sysCustomerQuoteMapper.insertSysCustomerQuote(sysCustomerQuote);
sysCustomerQuote.getId();
List<SysCustomerQuoteChild> sysCustomerQuoteChildList = sysCustomerQuote.getSysCustomerQuoteChildList();

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

@ -71,10 +71,10 @@
<div class="col-sm-8">
<!-- 报价币种单选按钮 -->
<div class="radio-inline">
<label><input type="radio" name="confirmTax" value="0">不含税</label>
<label><input type="radio" name="confirmTax" value="0" disabled>不含税</label>
</div>
<div class="radio-inline">
<label><input type="radio" name="confirmTax" value="1">含税</label>
<label><input type="radio" name="confirmTax" value="1" disabled>含税</label>
</div>
</div>
</div>
@ -117,7 +117,7 @@
</div>
</div>
<div class="container">
<div class="container" style="display: none;">
<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/>

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

@ -58,11 +58,11 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-6 control-label is-required">是否含税:</label>
<div class="col-sm-6">
<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="${'confirmTax_' + dict.dictCode}"
name="confirmTax" th:value="${dict.dictValue}" th:field="*{confirmTax}" th:checked="${dict.isDefault == 'Y' ? true : false}">
name="confirmTax" th:value="${dict.dictValue}" th:field="*{confirmTax}" th:checked="${dict.isDefault == 'Y' ? true : false}" disabled>
<label th:for="${'confirmTax_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
</div>
</div>
@ -92,7 +92,7 @@
<textarea readonly name="remark" th:field="*{remark}" class="form-control"></textarea>
</div>
</div>
<div class="container">
<div class="container" style="display: none;">
<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_detail" th:field="*{enterprise}" type="text" disabled/>

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

@ -92,7 +92,7 @@
<textarea readonly name="remark" th:field="*{remark}" class="form-control"></textarea>
</div>
</div>
<div class="container">
<div class="container" style="display: none;">
<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/>

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

@ -130,7 +130,7 @@
</div>
<input type="hidden" name="customerQuoteChildList" >
<div class="container">
<div class="container" style="display: none;">
<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" th:field="*{enterprise}" type="text" disabled/>

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

@ -139,7 +139,7 @@
<input type="hidden" name="customerQuoteChildList" >
<div class="container">
<div class="container" style="display: none;">
<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" th:field="*{enterprise}" type="text" disabled/>

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

@ -140,7 +140,7 @@
<input type="hidden" name="customerQuoteChildList" >
<div class="container">
<div class="container" style="display: none;">
<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" th:field="*{enterprise}" type="text" disabled/>

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

@ -141,7 +141,7 @@
<input type="hidden" name="customerQuoteChildList" >
<div class="container">
<div class="container" style="display: none;">
<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" th:field="*{enterprise}" type="text" disabled/>

Loading…
Cancel
Save