root
/
smart-erp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

[fix] 销售管理 

修复客户报价每次审批申请人和申请时间会变动的问题
修改客户报价业务经理审批前端页面：调整页面为统一格式；调整审批意见和批注的位置；设置美元汇率和是否含税不可修改；设置备注说明回显；
修改客户报价业务主管审批前端页面：调整页面为统一格式；调整审批意见和批注的位置；设置美元汇率和是否含税不可修改；设置备注说明回显；修复国内税率没有值的问题
修改客户报价总经理总助审批前端页面：调整页面为统一格式；调整审批意见和批注的位置；设置美元汇率和是否含税不可修改；设置备注说明回显；修复计算部分没有值的问题
修改客户报价驳回调整前端页面：调整页面为统一格式；调整审批意见和批注的位置；设置美元汇率和是否含税不可修改；设置备注说明回显；修复计算部分没有值的问题
dev
liuxiaoxu 3 weeks ago
parent
1eb2ceea5e
commit
64994db969
6 changed files with 150 additions and 212 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      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. 54
      ruoyi-admin/src/main/resources/templates/system/customerQuote/taskModifyApply.html
  4. 48
      ruoyi-admin/src/main/resources/templates/system/customerQuote/taskYwjlVerify.html
  5. 179
      ruoyi-admin/src/main/resources/templates/system/customerQuote/taskYwzgVerify.html
  6. 72
      ruoyi-admin/src/main/resources/templates/system/customerQuote/taskZozjVerify.html

3
ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerQuoteServiceImpl.java
View File

@ -203,9 +203,6 @@ public class SysCustomerQuoteServiceImpl implements ISysCustomerQuoteService {
}
}
}
// 启动流程
sysCustomerQuote.setApplyUser(user.getLoginName());
sysCustomerQuote.setApplyTime(DateUtils.getNowDate());
sysCustomerQuoteMapper.updateSysCustomerQuote(sysCustomerQuote);
// 启动流程
String applyTitle = user.getUserName()+"发起了客户报价信息提交审批-"+DateUtils.dateTimeNow();

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

@ -151,9 +151,9 @@
<a class="btn btn-success" onclick="insertRow()">
<i class="fa fa-plus"></i> 添加物料
</a>
<a class="btn btn-danger multiple" onclick="insertNoMaterialNoRow()">
<i class="fa fa-remove"></i> 添加无料号物料
</a>
<!-- <a class="btn btn-danger multiple" onclick="insertNoMaterialNoRow()">-->
<!-- <i class="fa fa-remove"></i> 添加无料号物料-->
<!-- </a>-->
</div>
</div>
<div class="row">

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

@ -116,43 +116,45 @@
<div class="form-group">
<label class="col-sm-4 control-label">备注说明：</label>
<div class="col-sm-8">
<textarea readonly name="remark" th:field="*{remark}" class="form-control"></textarea>
<textarea readonly name="remark" th:text="*{remark}" class="form-control"></textarea>
</div>
</div>
<div class="form-group">
<label class="col-sm-4 control-label" for="reApply">是否继续申请：</label>
<div class="col-sm-8">
<select id="reApply" name="p_B_reApply" class="form-control m-b">
<option value="true">重新申请</option>
<option value="false">结束流程</option>
</select>
</div>
</div>
<input type="hidden" name="customerQuoteChildList" >
<div class="container">
<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/>
<label class=" col-sm-2">数量合计：</label><input class="col-sm-4" name="enterpriseSum" id="enterpriseSum_edit" type="number" readonly/>
<label class=" col-sm-2">物料合计：</label><input class="col-sm-4" name="enterprise" id="enterprise_edit" th:field="*{enterprise}" type="text" disabled/>
<label class=" col-sm-2">数量合计：</label><input class="col-sm-4" name="enterpriseSum" id="enterpriseSum_edit" th:field="*{enterpriseSum}" type="number" disabled/>
</div>
<div class="col-xs-12 form-row">
<label class="col-sm-2"> 不含税单价：</label><input placeholder="RMB" class="col-sm-4" name="noRmb" id="noRmb_edit" type="number" readonly/>
<label class="col-sm-2"> 不含税总价：</label><input placeholder="RMB" class="col-sm-4" name="noRmbSum" id="noRmbSum_edit" type="number" readonly/>
<label class="col-sm-2"> 不含税单价：</label><input placeholder="RMB" class="col-sm-4" name="noRmb" id="noRmb_edit" th:field="*{noRmb}" type="number" disabled />
<label class="col-sm-2"> 不含税总价：</label><input placeholder="RMB" class="col-sm-4" name="noRmbSum" id="noRmbSum_edit" th:field="*{noRmbSum}" type="number" disabled/>
</div>
<div class="col-xs-12 form-row">
<label class="col-sm-2"> 含税单价：</label><input placeholder="RMB" class="col-sm-4" name="rmb" id="rmb_edit" type="number" readonly/>
<label class="col-sm-2"> 含税总价：</label><input placeholder="RMB" class="col-sm-4" name="rmbSum" id="rmbSum_edit" type="number" readonly/>
<label class="col-sm-2"> 含税单价：</label><input placeholder="RMB" class="col-sm-4" name="rmb" id="rmb_edit" type="number" th:field="*{rmb}" disabled/>
<label class="col-sm-2"> 含税总价：</label><input placeholder="RMB" class="col-sm-4" name="rmbSum" id="rmbSum_edit" th:field="*{rmbSum}" type="number" disabled/>
</div>
<div class="col-xs-12">
<label class="col-sm-2">不含税单价：</label><input placeholder="美元" class="col-sm-4" name="noUsd" id="noUsd_edit" type="number" readonly/>
<label class="col-sm-2">不含税总价：</label><input placeholder="美元" class="col-sm-4" name="noUsdSum" id="noUsdSum_edit" type="number" readonly/>
<div class="col-xs-12 form-row">
<label class="col-sm-2">不含税单价：</label><input placeholder="USD" class="col-sm-4" name="noUsd" id="noUsd_edit" th:field="*{noUsd}" type="number" disabled/>
<label class="col-sm-2">不含税总价：</label><input placeholder="USD" class="col-sm-4" name="noUsdSum" id="noUsdSum_edit" th:field="*{noUsdSum}" type="number" disabled/>
</div>
<div class="col-xs-12">
<label class="col-sm-2">含税单价：</label><input placeholder="美元" class="col-sm-4" name="usd" id="usd_edit" type="number" readonly/>
<label class="col-sm-2">含税总价：</label><input placeholder="美元" class="col-sm-4" name="usdSum" id="usdSum_edit" type="number" readonly/>
<div class="col-xs-12 form-row">
<label class="col-sm-2">含税单价：</label><input placeholder="USD" class="col-sm-4" name="usd" id="usd_edit" th:field="*{usd}" type="number" disabled/>
<label class="col-sm-2">含税总价：</label><input placeholder="USD" class="col-sm-4" name="usdSum" id="usdSum_edit" th:field="*{usdSum}" type="number" disabled/>
</div>
</div>
<hr/>
<div class="form-group">
<label class="col-sm-3 control-label" for="reApply">是否继续申请：</label>
<div class="col-sm-8">
<select id="reApply" name="p_B_reApply" class="form-control m-b">
<option value="true">重新申请</option>
<option value="false">结束流程</option>
</select>
</div>
</div>
<input type="hidden" name="customerQuoteChildList" >
</form>
<div class="other container">
<div class="form-row">
@ -161,9 +163,9 @@
<a class="btn btn-success" onclick="insertRow()">
<i class="fa fa-plus"></i> 添加物料
</a>
<a class="btn btn-danger multiple disabled" onclick="insertNRow()">
<i class="fa fa-remove"></i> 添加无料号物料
</a>
<!-- <a class="btn btn-danger multiple disabled" onclick="insertNRow()">-->
<!-- <i class="fa fa-remove"></i> 添加无料号物料-->
<!-- </a>-->
</div>
</div>
<div class="row">

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

@ -76,14 +76,14 @@
<div class="form-group">
<label class="col-sm-4 control-label">美元汇率：</label>
<div class="col-sm-8">
<input name="usdTax" th:field="*{usdTax}" id="usdTax_edit" class="form-control" type="number" placeholder="美元对人民币汇率" readonly/>
<input name="usdTax" th:field="*{usdTax}" id="usdTax_edit" class="form-control" type="number" placeholder="美元对人民币汇率" readonly>
</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}"
<input required disabled 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>
@ -111,9 +111,28 @@
<div class="form-group">
<label class="col-sm-4 control-label">备注说明：</label>
<div class="col-sm-8">
<textarea readonly name="remark" th:field="*{remark}" class="form-control"></textarea>
<textarea readonly name="remark" th:text="*{remark}" class="form-control"></textarea>
</div>
</div>
<div class="form-group">
<label class="col-sm-4 control-label" for="ywjlVerifyApproved"><span style="color: red; ">*</span>审批意见：</label>
<div class="col-sm-8">
<select name="p_B_ywjlVerifyApproved" id="ywjlVerifyApproved" class="form-control m-b" required>
<option value=""></option>
<option value="true">同意</option>
<option value="false">拒绝</option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-4 control-label">批注：</label>
<div class="col-sm-8">
<textarea name="comment" class="form-control"></textarea>
</div>
</div>
<input type="hidden" name="customerQuoteChildList" >
<div class="container">
<h4 class="form-header h4">计算</h4>
<div class="col-xs-12 form-row">
@ -137,25 +156,6 @@
<label class="col-sm-2">含税总价：</label><input placeholder="美元" class="col-sm-4" name="usdSum" id="usdSum_edit" type="number" readonly/>
</div>
</div>
<hr/>
<div class="form-group">
<label class="col-sm-3 control-label" for="ywjlVerifyApproved"><span style="color: red; ">*</span>审批意见：</label>
<div class="col-sm-8">
<select name="p_B_ywjlVerifyApproved" id="ywjlVerifyApproved" class="form-control m-b" required>
<option value=""></option>
<option value="true">同意</option>
<option value="false">拒绝</option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">批注：</label>
<div class="col-sm-8">
<textarea name="comment" class="form-control"></textarea>
</div>
</div>
<input type="hidden" name="customerQuoteChildList" >
</form>
<div class="other container">
<div class="form-row">

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

@ -14,13 +14,13 @@
<input name="instanceType" th:field="*{instanceType}" type="hidden">
<input type="hidden" name="p_COM_comment" />
<div class="form-group">
<label class="col-sm-3 control-label">申请人：</label>
<label class="col-sm-4 control-label">申请人：</label>
<div class="col-sm-8">
<input name="applyUserName" th:field="*{applyUserName}" class="form-control" type="text" readonly>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">申请时间：</label>
<label class="col-sm-4 control-label">申请时间：</label>
<div class="col-sm-8">
<div class="input-group date">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
@ -29,7 +29,7 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">标题：</label>
<label class="col-sm-4 control-label">标题：</label>
<div class="col-sm-8">
<input name="title" th:field="*{applyTitle}" class="form-control" type="text" readonly>
</div>
@ -68,7 +68,7 @@
<div class="form-group">
<label class="col-sm-4 control-label">报价币种：</label>
<div class="col-sm-8">
<select class="form-control" id="commonCurrency_edit" name="commonCurrency" th:with="dictList=${@dict.getType('sys_common_currency')}" th:field="*{commonCurrency}" required>
<select class="form-control" id="commonCurrency_edit" name="commonCurrency" th:with="dictList=${@dict.getType('sys_common_currency')}" th:field="*{commonCurrency}" disabled required>
<option value="">请选择</option>
<option th:each="dict : ${dictList}" th:value="${dict.dictValue}" th:text="${dict.dictLabel}" ></option>
</select>
@ -77,14 +77,14 @@
<div class="form-group">
<label class="col-sm-4 control-label">美元汇率：</label>
<div class="col-sm-8">
<input name="usdTax" th:field="*{usdTax}" id="usdTax_edit" class="form-control" type="number" placeholder="美元对人民币汇率">
<input name="usdTax" th:field="*{usdTax}" id="usdTax_edit" class="form-control" type="number" placeholder="美元对人民币汇率" readonly>
</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}"
<input required disabled 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>
@ -93,7 +93,10 @@
<div class="form-group">
<label class="col-sm-4 control-label">国内税率：</label>
<div class="col-sm-8">
<input name="rmbTax" id="rmbTax_edit" th:field="*{rmbTax}" class="form-control" type="number" placeholder="13%" />
<div class="input-group">
<input name="rmbTax" id="rmbTax_edit" th:field="*{rmbTax}" class="form-control" placeholder="13" type="number" readonly/>
<span class="input-group-addon">%</span>
</div>
</div>
</div>
<div class="form-group">
@ -109,36 +112,11 @@
<div class="form-group">
<label class="col-sm-4 control-label">备注说明：</label>
<div class="col-sm-8">
<textarea readonly name="remark" th:field="*{remark}" class="form-control"></textarea>
</div>
</div>
<div class="container">
<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/>
<label class=" col-sm-2">数量合计：</label><input class="col-sm-4" name="enterpriseSum" id="enterpriseSum_edit" type="number" readonly/>
</div>
<div class="col-xs-12 form-row">
<label class="col-sm-2"> 不含税单价：</label><input placeholder="RMB" class="col-sm-4" name="noRmb" id="noRmb_edit" type="number" readonly/>
<label class="col-sm-2"> 不含税总价：</label><input placeholder="RMB" class="col-sm-4" name="noRmbSum" id="noRmbSum_edit" type="number" readonly/>
</div>
<div class="col-xs-12 form-row">
<label class="col-sm-2"> 含税单价：</label><input placeholder="RMB" class="col-sm-4" name="rmb" id="rmb_edit" type="number" readonly/>
<label class="col-sm-2"> 含税总价：</label><input placeholder="RMB" class="col-sm-4" name="rmbSum" id="rmbSum_edit" type="number" readonly/>
</div>
<div class="col-xs-12">
<label class="col-sm-2">不含税单价：</label><input placeholder="美元" class="col-sm-4" name="noUsd" id="noUsd_edit" type="number" readonly/>
<label class="col-sm-2">不含税总价：</label><input placeholder="美元" class="col-sm-4" name="noUsdSum" id="noUsdSum_edit" type="number" readonly/>
</div>
<div class="col-xs-12">
<label class="col-sm-2">含税单价：</label><input placeholder="美元" class="col-sm-4" name="usd" id="usd_edit" type="number" readonly/>
<label class="col-sm-2">含税总价：</label><input placeholder="美元" class="col-sm-4" name="usdSum" id="usdSum_edit" type="number" readonly/>
<textarea readonly name="remark" th:text="*{remark}" class="form-control"></textarea>
</div>
</div>
<hr/>
<div class="form-group">
<label class="col-sm-3 control-label" for="ywzgVerifyApproved"><span style="color: red; ">*</span>审批意见：</label>
<label class="col-sm-4 control-label" for="ywzgVerifyApproved"><span style="color: red; ">*</span>审批意见：</label>
<div class="col-sm-8">
<select name="p_B_ywzgVerifyApproved" id="ywzgVerifyApproved" class="form-control m-b" required>
<option value=""></option>
@ -148,12 +126,38 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">批注：</label>
<label class="col-sm-4 control-label">批注：</label>
<div class="col-sm-8">
<textarea name="comment" class="form-control"></textarea>
</div>
</div>
<input type="hidden" name="customerQuoteChildList" >
<div class="container">
<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/>
<label class=" col-sm-2">数量合计：</label><input class="col-sm-4" name="enterpriseSum" id="enterpriseSum_edit" th:field="*{enterpriseSum}" type="number" disabled/>
</div>
<div class="col-xs-12 form-row">
<label class="col-sm-2"> 不含税单价：</label><input placeholder="RMB" class="col-sm-4" name="noRmb" id="noRmb_edit" th:field="*{noRmb}" type="number" disabled />
<label class="col-sm-2"> 不含税总价：</label><input placeholder="RMB" class="col-sm-4" name="noRmbSum" id="noRmbSum_edit" th:field="*{noRmbSum}" type="number" disabled/>
</div>
<div class="col-xs-12 form-row">
<label class="col-sm-2"> 含税单价：</label><input placeholder="RMB" class="col-sm-4" name="rmb" id="rmb_edit" type="number" th:field="*{rmb}" disabled/>
<label class="col-sm-2"> 含税总价：</label><input placeholder="RMB" class="col-sm-4" name="rmbSum" id="rmbSum_edit" th:field="*{rmbSum}" type="number" disabled/>
</div>
<div class="col-xs-12 form-row">
<label class="col-sm-2">不含税单价：</label><input placeholder="USD" class="col-sm-4" name="noUsd" id="noUsd_edit" th:field="*{noUsd}" type="number" disabled/>
<label class="col-sm-2">不含税总价：</label><input placeholder="USD" class="col-sm-4" name="noUsdSum" id="noUsdSum_edit" th:field="*{noUsdSum}" type="number" disabled/>
</div>
<div class="col-xs-12 form-row">
<label class="col-sm-2">含税单价：</label><input placeholder="USD" class="col-sm-4" name="usd" id="usd_edit" th:field="*{usd}" type="number" disabled/>
<label class="col-sm-2">含税总价：</label><input placeholder="USD" class="col-sm-4" name="usdSum" id="usdSum_edit" th:field="*{usdSum}" type="number" disabled/>
</div>
</div>
<hr/>
</form>
<div class="other container">
<div class="form-row">
@ -207,17 +211,6 @@
}
}
});
var confirmTax = $("input[name='confirmTax']");
confirmTax.val([sysCustomerQuote.confirmTax]);
$("input[name='rmbTax']").val([sysCustomerQuote.taxRate]);
confirmTax.change(function () {
if ($("input[name='confirmTax']").val() == "1") {
$("input[name='rmbTax']").val(sysCustomerQuote.taxRate);
} else {
$("input[name='rmbTax']").val(0);
}
});
$("#commonCurrency_edit").val(sysCustomerQuote.commonCurrency).trigger('change');
});
$(function() {
var options = {
@ -373,7 +366,7 @@
}
],
onEditableSave:function(field, row, oldValue, $el){
var commonCurrency1 = $("#commonCurrency_edit option:selected").val();
commonCurrency = $("#commonCurrency_edit option:selected").val();
var rmb1 = $("#rmbTax_edit").val();
if (rmb1 =='' || rmb1== null){
rmb1 = 0;
@ -387,24 +380,22 @@
}else{
usd = Number(usd).toFixed(2);
}
console.log(commonCurrency1);
if(commonCurrency1 == 1){
row.materialRmb = Number(row.materialNoRmb * Number(1 + rmb));
row.materialNoRmbSum = Number(row.materialNum * Number(row.materialNoRmb)).toFixed(2);
row.materialRmbSum = Number(row.materialRmb * row.materialNum).toFixed(2);
row.materialNoUsd = Number(row.materialNoRmb / usd).toFixed(2);
row.materialNoUsdSum = Number(row.materialNum) * Number(row.materialNoUsd);
row.materialUsd = Number(row.materialNoUsd).toFixed(2)
row.materialUsdSum = Number(row.materialNum * Number(row.materialUsd)).toFixed(2);
console.log(commonCurrency);
if(commonCurrency == 1){
row.materialRmb = Number(row.materialNoRmb * (1 + rmb)).toFixed(2);
row.materialNoUsd = Number(row.materialNoRmb / rmb).toFixed(2);
row.materialNoUsdSum = Number(row.materialNum * row.materialNoUsd).toFixed(2);
row.materialUsd = Number(usd * row.materialNoUsd).toFixed(2);
row.materialUsdSum = Number(row.materialNum * row.materialUsd).toFixed(2);
row.materialNoRmbSum = Number(row.materialNum* row.materialNoRmb).toFixed(2);
}
else if(commonCurrency1 == 2){
else if( commonCurrency == 2){
row.materialUsd = Number(row.materialNoUsd).toFixed(2);
row.materialUsdSum = Number(row.materialNum * row.materialUsd).toFixed(2);
row.materialNoUsdSum = Number(row.materialNoUsd * row.materialNum).toFixed(2);
row.materialNoRmb = Number(row.materialNoUsd * usd).toFixed(2);
row.materialRmb = Number(row.materialNoRmb * (1 + rmb)).toFixed(2);
row.materialNoRmb = Number(row.materialNoUsd).toFixed(2);
row.materialRmb = usd * Number(row.materialNoUsd * (1 + rmb)).toFixed(2);
row.materialNoRmbSum = Number(row.materialNoRmb * row.materialNum).toFixed(2);
row.materialRmbSum = Number(row.materialRmb * row.materialNum).toFixed(2);
}
getTotalAmount()
},
@ -414,69 +405,13 @@
function queryParams(params) {
var curParams = {
// 传递参数查询参数
pageSize: params.limit,
pageNum: params.offset / params.limit + 1,
quoteId: sysCustomerQuote.supplierCode,
pageSize: params.limit,
pageNum: params.offset / params.limit + 1,
quoteId: sysCustomerQuote.supplierCode,
};
curParams.quoteId = sysCustomerQuote.supplierCode;
return curParams;
}
function doSubmit(index, layero,uniqueId){
console.log(uniqueId);
var iframeWin = window[layero.find('iframe')[0]['name']];
var rowData = iframeWin.$('#bootstrap-select-table').bootstrapTable('getSelections')[0];
console.log("rowData: "+rowData);
let enterpriseSum = $("#enterpriseSum").val();
var timestamp = new Date().getTime();
var totalNum = $("#bootstrap-table-Quote-child3").bootstrapTable('getData').length;
$("#bootstrap-table-Quote-child3").bootstrapTable('insertRow', {
index: totalNum,
row: {
id:'',
quoteId:$("#supplierCode").val(),
materialId:rowData.id,
materialCode: rowData.materialNo,
materialName: rowData.materialName,
materialType: rowData.materialType,
describe: rowData.describe,
brand: rowData.brand,
photoUrl: rowData.photoUrl,
unit: rowData.unit,
processMethod: rowData.processMethod,
countTax: '',
usdTax: '',
materialSole: "",
materialNum: "",
materialNoRmb: "",
materialNoUsd: "",
materialRmb: "",
materialNoRmbSum: "",
materialRmbSum: "",
materialUsd: "",
materialUsdSum: "",
materialNoUsdSum: "",
remark: "",
}
})
layer.close(index);
}
function insertRow() {
var url = ctx + "erp/material/select";
var options = {
title: '选择料号',
url: url,
callBack: doSubmit
};
$.modal.openOptions(options);
}
/* 删除指定表格行 */
function removeRow(rowData){
$.table.bootstrapTable('remove', {
field: 'id',
values: rowData.id
});
getTotalAmount();
}
$("input[name='pricingDate']").datetimepicker({
format: "yyyy-mm-dd",
minView: "month",
@ -484,7 +419,7 @@
});
//计算
function getTotalAmount(){
let getData = $("#bootstrap-table-Quote-child3").bootstrapTable('getData', true);
let getData = $("#bootstrap-table-Quote-child5").bootstrapTable('getData');
var enterprise = "";
let enterpriseSum = 0;
let noRmb = 0;let rmb = 0;let noRmbSum = 0;

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

@ -15,13 +15,13 @@
<input name="instanceType" th:field="*{instanceType}" type="hidden">
<input type="hidden" name="p_COM_comment" />
<div class="form-group">
<label class="col-sm-3 control-label">申请人：</label>
<label class="col-sm-4 control-label">申请人：</label>
<div class="col-sm-8">
<input name="applyUserName" th:field="*{applyUserName}" class="form-control" type="text" readonly>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">申请时间：</label>
<label class="col-sm-4 control-label">申请时间：</label>
<div class="col-sm-8">
<div class="input-group date">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
@ -30,7 +30,7 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">标题：</label>
<label class="col-sm-4 control-label">标题：</label>
<div class="col-sm-8">
<input name="title" th:field="*{applyTitle}" class="form-control" type="text" readonly>
</div>
@ -47,29 +47,29 @@
<input name="supplierCode" th:field="*{supplierCode}" class="form-control" type="text" readonly>
</div>
</div>
<div class="col-xs-12" shiro:hasPermission="system:customerQuote:edit">
<div class="form-group">
<label class="col-sm-4 control-label">业务员：</label>
<div class="col-sm-8">
<select class="form-control" name="businessMembers" th:field="*{businessMembers}" required disabled >
</select>
<input class="form-control" name="businessMembers" th:field="*{businessMembers}" disabled required />
</div>
</div>
<div class="form-group">
<label class="col-sm-4 control-label">客户编号：</label>
<div class="col-sm-8">
<input readonly class="form-control" th:field="*{customerCode}" name="customerCode" required disabled>
<input readonly class="form-control" th:field="*{customerCode}" name="customerCode" required >
</div>
</div>
<div class="form-group">
<label class="col-sm-4 control-label">客户名称：</label>
<div class="col-sm-8">
<input redonly name="customerName" th:field="*{customerName}" class="form-control m-b" type="text" disabled />
<input redonly name="customerName" th:field="*{customerName}" class="form-control m-b" type="text" readonly />
</div>
</div>
<div class="form-group">
<label class="col-sm-4 control-label">报价币种：</label>
<div class="col-sm-8">
<select class="form-control" id="commonCurrency_edit" name="commonCurrency" th:with="dictList=${@dict.getType('sys_common_currency')}" th:field="*{commonCurrency}" required>
<select class="form-control" id="commonCurrency_edit" name="commonCurrency" th:with="dictList=${@dict.getType('sys_common_currency')}" th:field="*{commonCurrency}" disabled required>
<option value="">请选择</option>
<option th:each="dict : ${dictList}" th:value="${dict.dictValue}" th:text="${dict.dictLabel}" ></option>
</select>
@ -78,16 +78,15 @@
<div class="form-group">
<label class="col-sm-4 control-label">美元汇率：</label>
<div class="col-sm-8">
<input name="usdTax" id="usdTax_edit" th:field="*{usdTax}"
class="form-control" type="number" placeholder="美元对人民币汇率">
<input name="usdTax" th:field="*{usdTax}" id="usdTax_edit" class="form-control" type="number" placeholder="美元对人民币汇率" readonly>
</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 type="radio" th:id="${'confirmTax_' + dict.dictCode}" th:field="*{confirmTax}"
name="confirmTax" th:value="${dict.dictValue}" required>
<input required disabled 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>
@ -95,7 +94,10 @@
<div class="form-group">
<label class="col-sm-4 control-label">国内税率：</label>
<div class="col-sm-8">
<input name="rmbTax" id="rmbTax_edit" th:field="*{rmbTax}" class="form-control" type="number" placeholder="%" />
<div class="input-group">
<input name="rmbTax" id="rmbTax_edit" th:field="*{rmbTax}" class="form-control" placeholder="13" type="number" readonly/>
<span class="input-group-addon">%</span>
</div>
</div>
</div>
<div class="form-group">
@ -111,9 +113,28 @@
<div class="form-group">
<label class="col-sm-4 control-label">备注说明：</label>
<div class="col-sm-8">
<textarea readonly name="remark" th:field="*{remark}" class="form-control"></textarea>
<textarea readonly name="remark" th:text="*{remark}" class="form-control"></textarea>
</div>
</div>
<div class="form-group">
<label class="col-sm-4 control-label" for="zozjVerifyApproved"><span style="color: red; ">*</span>审批意见：</label>
<div class="col-sm-8">
<select name="p_B_zozjVerifyApproved" id="zozjVerifyApproved" class="form-control m-b" required>
<option value=""></option>
<option value="true">同意</option>
<option value="false">拒绝</option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-4 control-label">批注：</label>
<div class="col-sm-8">
<textarea name="comment" class="form-control"></textarea>
</div>
</div>
<input type="hidden" name="customerQuoteChildList" >
<div class="container">
<h4 class="form-header h4">计算</h4>
<div class="col-xs-12 form-row">
@ -139,23 +160,6 @@
</div>
<hr/>
<div class="form-group">
<label class="col-sm-3 control-label" for="zozjVerifyApproved"><span style="color: red; ">*</span>审批意见：</label>
<div class="col-sm-8">
<select name="p_B_zozjVerifyApproved" id="zozjVerifyApproved" class="form-control m-b" required>
<option value=""></option>
<option value="true">同意</option>
<option value="false">拒绝</option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">批注：</label>
<div class="col-sm-8">
<textarea name="comment" class="form-control"></textarea>
</div>
</div>
<input type="hidden" name="customerQuoteChildList" >
</form>
<div class="other container">
<div class="form-row">

Write Preview
Loading…
Cancel
Save