Browse Source

[fix] 销售管理

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

7
ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesOrderServiceImpl.java

@ -281,6 +281,13 @@ public class SysSalesOrderServiceImpl implements ISysSalesOrderService
sysSalesOrder.setCreateBy(loginName);
sysSalesOrder.setCreateTime(DateUtils.getNowDate());
sysSalesOrder.setSalesOrderCode(getId());
String commonCurrency = sysSalesOrder.getCommonCurrency();
if(RMB.equals(commonCurrency)){
sysSalesOrder.setConfirmTax("1");
}else {
sysSalesOrder.setConfirmTax("0");
}
int result = sysSalesOrderMapper.insertSysSalesOrder(sysSalesOrder);
sysSalesOrder.getSalesOrderId();
int s = sysSalesOrder.getSysSalesOrderChildList().size();

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

@ -197,10 +197,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>
@ -271,7 +271,7 @@
<!-- </select>-->
</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="materialSum" id="enterprise_add" type="text" readonly/>

2
ruoyi-admin/src/main/resources/templates/system/salesOrder/detail.html

@ -279,7 +279,7 @@
<input name="businessMembers" th:field="*{businessMembers}" class="form-control" type="text" disabled>
</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="materialSum" type="number" th:field="*{materialSum}" readonly/>

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

@ -283,7 +283,7 @@
</select>
</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="materialSum" id="enterprise_edit" type="number" th:field="*{materialSum}" readonly/>

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

@ -248,7 +248,7 @@
<input name="businessMembers" class="form-control m-b" th:field="*{businessMembers}" readonly required>
</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>

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

@ -267,7 +267,7 @@
<textarea name="comment" 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>

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

@ -266,7 +266,7 @@
<textarea name="comment" 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>

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

@ -266,7 +266,7 @@
<textarea name="comment" 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>

Loading…
Cancel
Save