|
|
|
@ -12,7 +12,7 @@ |
|
|
|
</head> |
|
|
|
<body class="white-bg"> |
|
|
|
<div id="app" class="wrapper wrapper-content animated fadeInRight ibox-content"> |
|
|
|
<form class="form-horizontal m" id="form-modfify-audit" th:object="${formData}"> |
|
|
|
<form class="form-horizontal m" id="form-modify-audit" th:object="${formData}"> |
|
|
|
<input name="salesOrderId" th:field="*{salesOrderId}" type="hidden"> |
|
|
|
<input name="taskId" th:field="*{taskId}" type="hidden"> |
|
|
|
<input name="taskName" th:field="*{taskName}" type="hidden"> |
|
|
|
@ -20,6 +20,7 @@ |
|
|
|
<input name="instanceType" th:field="*{instanceType}" type="hidden"> |
|
|
|
<!--驳回调整允许更新内容--> |
|
|
|
<input type="hidden" name="saveEntity" value="true" /> |
|
|
|
<input type="hidden" name="p_B_reApply" class="form-control m-b" /> |
|
|
|
<div class="form-group"> |
|
|
|
<label class="col-sm-3 control-label">申请人：</label> |
|
|
|
<div class="col-sm-8"> |
|
|
|
@ -74,8 +75,9 @@ |
|
|
|
<div class="form-group"> |
|
|
|
<label class="col-sm-3 control-label">客户联系人：</label> |
|
|
|
<div class="col-sm-8"> |
|
|
|
<input id="customerContact" name="customerContact" th:field="*{customerContact}" class="form-control m-b" /> |
|
|
|
|
|
|
|
<select id="customerContact_edit" name="customerContact" th:field="*{customerContact}" |
|
|
|
class="form-control"> |
|
|
|
</select> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
<div class="form-group"> |
|
|
|
@ -99,7 +101,7 @@ |
|
|
|
<div class="form-group"> |
|
|
|
<label class="col-sm-3 control-label">客户收货人：</label> |
|
|
|
<div class="col-sm-8"> |
|
|
|
<select name="customerDelivery" th:field="*{customerDelivery}" class="form-control m-b" > |
|
|
|
<select name="customerDelivery" id="customerDelivery_edit" th:field="*{customerDelivery}" class="form-control m-b" > |
|
|
|
</select> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
@ -118,13 +120,13 @@ |
|
|
|
<div class="form-group"> |
|
|
|
<label class="col-sm-3 control-label">客户订单号：</label> |
|
|
|
<div class="col-sm-8"> |
|
|
|
<input name="salesOrderNumber" th:field="*{salesOrderNumber}" class="form-control" type="text"> |
|
|
|
<input name="salesOrderNumber" th:field="*{salesOrderNumber}" class="form-control" type="text" disabled> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
<div class="form-group"> |
|
|
|
<label class="col-sm-3 control-label is-required">订单类型：</label> |
|
|
|
<div class="col-sm-8"> |
|
|
|
<select name="salesOrderType" class="form-control" type="text" th:with="dictList=${@dict.getType('sys_order_type')}" required> |
|
|
|
<select name="salesOrderType" class="form-control" type="text" th:with="dictList=${@dict.getType('sys_order_type')}" disabled required> |
|
|
|
<option th:each="dict : ${dictList}" th:value="${dict.dictValue}" th:text="${dict.dictLabel}"></option> |
|
|
|
</select> |
|
|
|
</div> |
|
|
|
@ -133,7 +135,7 @@ |
|
|
|
<label class="col-sm-3 control-label">接单日期：</label> |
|
|
|
<div class="col-sm-8"> |
|
|
|
<div class="input-group date"> |
|
|
|
<input name="orderReceivingTime" class="form-control" th:field="*{orderReceivingTime}" placeholder="yyyy-mm-dd" type="text"> |
|
|
|
<input name="orderReceivingTime" class="form-control" placeholder="yyyy-mm-dd" type="text" th:field="*{orderReceivingTime}" /> |
|
|
|
<span class="input-group-addon"><i class="fa fa-calendar"></i></span> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
@ -156,14 +158,14 @@ |
|
|
|
<div class="form-group"> |
|
|
|
<label class="col-sm-3 control-label is-required">美元汇率：</label> |
|
|
|
<div class="col-sm-8"> |
|
|
|
<input name="usdTax" class="form-control" th:field="*{udsTax}" type="text" required /> |
|
|
|
<input name="usdTax" class="form-control" th:field="*{usdTax}" type="text" required /> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
<div class="form-group"> |
|
|
|
<label class="col-sm-3 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 type="radio" th:id="${'confirmTax_' + dict.dictCode}" required |
|
|
|
name="confirmTax" th:value="${dict.dictValue}" th:checked="${dict.default}"> |
|
|
|
<label th:for="${'confirmTax_' + dict.dictCode}" th:text="${dict.dictLabel}"></label> |
|
|
|
</div> |
|
|
|
@ -216,8 +218,8 @@ |
|
|
|
<label class="col-sm-3 control-label">客户验收时间：</label> |
|
|
|
<div class="col-sm-8"> |
|
|
|
<div class="input-group date"> |
|
|
|
<input name="modificationTime" class="form-control" placeholder="yyyy-mm-dd" type="text"> |
|
|
|
<span class="input-group-addon" th:value="*{modificationTime}"><i class="fa fa-calendar"></i></span> |
|
|
|
<input name="modificationTime" th:field="*{modificationTime}" class="form-control" placeholder="yyyy-mm-dd" type="text"> |
|
|
|
<span class="input-group-addon"><i class="fa fa-calendar"></i></span> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
@ -237,8 +239,7 @@ |
|
|
|
<div class="form-group"> |
|
|
|
<label class="col-sm-3 control-label">业务员：</label> |
|
|
|
<div class="col-sm-8"> |
|
|
|
<select name="businessMembers" class="form-control m-b" th:field="*{businessMembers}" required> |
|
|
|
</select> |
|
|
|
<input name="businessMembers" class="form-control m-b" th:field="*{businessMembers}" readonly required> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
<div class="container"> |
|
|
|
@ -279,19 +280,24 @@ |
|
|
|
<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"> |
|
|
|
<select id="reApply" name="reApply" class="form-control m-b"> |
|
|
|
<option value="true">重新申请</option> |
|
|
|
<option value="false">结束流程</option> |
|
|
|
</select> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
<input type="hidden" name="salesOrderChildList" id="salesOrderChildList_modify"/> |
|
|
|
</form> |
|
|
|
<div class="other-container"> |
|
|
|
<div class="form-row"> |
|
|
|
<div class="btn-group-sm" id="toolbars" role="group"> |
|
|
|
<span>选择报价信息</span> |
|
|
|
<a class="btn btn-success" onclick="insertRow()"> |
|
|
|
<i class="fa fa-plus"></i> 添加物料 |
|
|
|
</a> |
|
|
|
</div> |
|
|
|
|
|
|
|
</div> |
|
|
|
<div class="row"> |
|
|
|
<div class="col-sm-12 select-table table-striped"> |
|
|
|
@ -313,24 +319,12 @@ |
|
|
|
var auditStatusDatas = [[${@dict.getType('auditStatus')}]]; |
|
|
|
var sysUnitClassDatas = [[${@dict.getType('sys_unit_class')}]]; |
|
|
|
var processMethodDatas = [[${@dict.getType('processMethod')}]]; |
|
|
|
var sysSalesOrder = [[${formData}]]; |
|
|
|
$("#form-modfify-audit").validate({onkeyup: false,rules:{},messages: {}, focusCleanup: true}); |
|
|
|
var salesOrderCode = [[${formData.salesOrderCode}]]; |
|
|
|
var customerContact = [[${formData.customerContact}]]; |
|
|
|
var customerDelivery = [[${formData.customerDelivery}]]; |
|
|
|
var enterpriseCode = [[${formData.enterpriseCode}]]; |
|
|
|
$("#form-modify-audit").validate({onkeyup: false,rules:{},messages: {}, focusCleanup: true}); |
|
|
|
|
|
|
|
function submitHandler() { |
|
|
|
if ($.validate.form()) { |
|
|
|
var taskId = [[${taskId}]]; |
|
|
|
$.operate.save(prefix + "/complete/" + taskId, $('#form-modfify-audit').serialize()); |
|
|
|
} |
|
|
|
} |
|
|
|
$("#form-modfify-audit").validate({focusCleanup: true}); |
|
|
|
var prefix = ctx + "system/salesOrder"; |
|
|
|
var commonCurrencyDatas = [[${@dict.getType('sys_common_currency')}]]; |
|
|
|
var materialTypeDatas = [[${@category.getChildByCode('materialType')}]]; |
|
|
|
var auditStatusDatas = [[${@dict.getType('auditStatus')}]]; |
|
|
|
var sysUnitClassDatas = [[${@dict.getType('sys_unit_class')}]]; |
|
|
|
var processMethodDatas = [[${@dict.getType('processMethod')}]]; |
|
|
|
var sysSalesOrder = [[${formData}]]; |
|
|
|
$("#form-modfify-audit").validate({focusCleanup: true}); |
|
|
|
$(function() { |
|
|
|
var options = { |
|
|
|
id:'bootstrap-sub-table-editOrder4', |
|
|
|
@ -341,10 +335,9 @@ |
|
|
|
model: "物料报价信息", |
|
|
|
columns: [ |
|
|
|
{checkbox: true}, |
|
|
|
{field: 'index',align: 'center', title: "序号", |
|
|
|
{field: 'materialIndex',align: 'center', title: "序号", |
|
|
|
formatter: function (value, row, index) { |
|
|
|
var columnIndex = $.common.sprintf("<input type='hidden' name='index' value='%s'>", $.table.serialNumber(index)); |
|
|
|
return columnIndex + $.table.serialNumber(index); |
|
|
|
return $.table.serialNumber(index); |
|
|
|
} |
|
|
|
}, |
|
|
|
{title: '物料索引id',field: 'materialId',align: 'center',visible: false}, |
|
|
|
@ -418,7 +411,7 @@ |
|
|
|
{title: '操作', align: 'center', |
|
|
|
formatter: function (value, row, index) { |
|
|
|
var actions = []; |
|
|
|
actions.push('<a class="btn btn-danger btn-xs" href="javascript:void(0)" onclick="removeRow(\'' + row.index + '\')"><i class="fa fa-remove"></i>删除</a> '); |
|
|
|
actions.push('<a class="btn btn-danger btn-xs" href="javascript:void(0)" onclick="removeRow(\'' + row.materialId + '\')"><i class="fa fa-remove"></i>删除</a> '); |
|
|
|
return actions.join(''); |
|
|
|
} |
|
|
|
} |
|
|
|
@ -462,25 +455,6 @@ |
|
|
|
}, |
|
|
|
}; |
|
|
|
$.table.init(options); |
|
|
|
$.ajax({ |
|
|
|
type: "post", |
|
|
|
url:ctx + "system/customer/customerList", |
|
|
|
dataType:"json", |
|
|
|
delay:250, |
|
|
|
cache:true, |
|
|
|
success: function (res, params) { |
|
|
|
if (res.rows.length > 0) { |
|
|
|
var result = res.rows; |
|
|
|
for (let i in result) { |
|
|
|
$("#form-modfify-audit select[name='enterpriseCode']").append( |
|
|
|
"<option value='" + result[i].enterpriseCode + "'>" + result[i].enterpriseCode + "</option>"); |
|
|
|
} |
|
|
|
$("#form-modfify-audit select[name='enterpriseCode']").val(sysSalesOrder.enterpriseCode).trigger("change"); |
|
|
|
} else { |
|
|
|
$.modal.msgError(res.msg); |
|
|
|
} |
|
|
|
}, |
|
|
|
}); |
|
|
|
$.ajax({ |
|
|
|
type: "post", |
|
|
|
url:ctx + "system/customer/shippingList", |
|
|
|
@ -488,16 +462,16 @@ |
|
|
|
delay:250, |
|
|
|
cache:true, |
|
|
|
data:{ |
|
|
|
enterpriseCode:sysSalesOrder.enterpriseCode, |
|
|
|
enterpriseCode:enterpriseCode, |
|
|
|
}, |
|
|
|
success: function (res, params) { |
|
|
|
if (res.rows.length > 0) { |
|
|
|
var result = res.rows; |
|
|
|
for (let i in result) { |
|
|
|
$("#form-modfify-audit select[name='customerDelivery']").append( |
|
|
|
$("#form-modify-audit select[name='customerDelivery']").append( |
|
|
|
"<option value='" + result[i].customerName + "'>" + result[i].customerName + "</option>"); |
|
|
|
} |
|
|
|
$("#form-modfify-audit select[name='customerDelivery']").val(sysSalesOrder.customerDelivery).trigger() |
|
|
|
$("#form-modify-audit select[name='customerDelivery']").val(customerDelivery).trigger("change"); |
|
|
|
} |
|
|
|
} |
|
|
|
}); |
|
|
|
@ -508,42 +482,22 @@ |
|
|
|
delay:250, |
|
|
|
cache:true, |
|
|
|
data:{ |
|
|
|
enterpriseCode:sysSalesOrder.enterpriseCode, |
|
|
|
enterpriseCode:enterpriseCode, |
|
|
|
}, |
|
|
|
success: function (res, params) { |
|
|
|
if (res.rows.length > 0) { |
|
|
|
var result = res.rows; |
|
|
|
for (let i in result) { |
|
|
|
$("#form-modfify-audit select[name='customerContact']").append( |
|
|
|
$("#form-modify-audit select[name='customerContact']").append( |
|
|
|
"<option value='" + result[i].customerName + "'>" + result[i].customerName + "</option>"); |
|
|
|
} |
|
|
|
$("#form-modfify-audit select[name='customerContact']").val(sysSalesOrder.customerContact).trigger("change"); |
|
|
|
$("#form-modify-audit select[name='customerContact']").val(customerContact).trigger("change"); |
|
|
|
} else { |
|
|
|
$.modal.msgError(res.msg); |
|
|
|
} |
|
|
|
}, |
|
|
|
}); |
|
|
|
$("#enterprise_edit").val(sysSalesOrder.enterprise); |
|
|
|
$("#enterpriseSum_edit").val(sysSalesOrder.enterpriseSum); |
|
|
|
$("#noRmb_edit").val(sysSalesOrder.noRmb); |
|
|
|
$("#rmb_edit").val(sysSalesOrder.rmb); |
|
|
|
$("#noRmbSum_edit").val(sysSalesOrder.noRmbSum); |
|
|
|
$("#rmbTax_edit").val(sysSalesOrder.rmbSum); |
|
|
|
$("#noUsd_edit").val(sysSalesOrder.noUsd); |
|
|
|
$("#usd_edit").val(sysSalesOrder.usd); |
|
|
|
$("#noUsdSum_edit").val(sysSalesOrder.noUsdSum); |
|
|
|
$("#usdSum_edit").val(sysSalesOrder.usdSum); |
|
|
|
binessMembers(); |
|
|
|
}); |
|
|
|
$('#enterpriseCode_edit').on('select2:select', function (e) { |
|
|
|
var data = e.params.data; |
|
|
|
$("input[name='enterpriseName']").val(data.enterpriseName); |
|
|
|
$("input[name='customerPurser']").val(data.customerPurser); |
|
|
|
$("input[name='taxRate']").val(data.taxRate); |
|
|
|
$("input[name='confirmFax']").val(data.confirmTax); |
|
|
|
$("#commonCurrency_add").val(data.commonCurrency).trigger('change'); |
|
|
|
commonCurrency = $("#commonCurrency_edit option:selected").val(); |
|
|
|
console.log("commonCurrency",commonCurrency); |
|
|
|
getBusinessMembers(); |
|
|
|
}); |
|
|
|
$('#customerContact_edit').on('select2:select', function (e) { |
|
|
|
var data = e.params.data; |
|
|
|
@ -556,17 +510,17 @@ |
|
|
|
$("input[name='deliveryPhone']").val(data1.customerPhone); |
|
|
|
$("input[name='deliveryAddress']").val(data1.deliveryAddress); |
|
|
|
}); |
|
|
|
function binessMembers(){ |
|
|
|
function getBusinessMembers(){ |
|
|
|
$.ajax({ |
|
|
|
url: ctx + 'system/salesOrder/getBinessMembers', |
|
|
|
type: 'get', |
|
|
|
success: function (res) { |
|
|
|
console.log(res) |
|
|
|
if (res.rows.length > 0) { |
|
|
|
var usertData = res.rows; |
|
|
|
for (let i in usertData) { |
|
|
|
var userData = res.rows; |
|
|
|
for (let i in userData) { |
|
|
|
$("select[name='businessMembers']").append( |
|
|
|
"<option value='" + usertData[i].userName + "'>" + usertData[i].userName + "</option>"); |
|
|
|
"<option value='" + userData[i].userName + "'>" + userData[i].userName + "</option>"); |
|
|
|
} |
|
|
|
} else { |
|
|
|
$.modal.msgError(res.msg); |
|
|
|
@ -579,9 +533,9 @@ |
|
|
|
// 传递参数查询参数 |
|
|
|
pageSize: params.limit, |
|
|
|
pageNum: params.offset / params.limit + 1, |
|
|
|
quoteId: sysSalesOrder.salesOrderCode, |
|
|
|
quoteId: salesOrderCode |
|
|
|
}; |
|
|
|
curParams.quoteId = sysSalesOrder.salesOrderCode; |
|
|
|
curParams.quoteId = salesOrderCode |
|
|
|
return curParams; |
|
|
|
} |
|
|
|
function doSubmit(index, layero,uniqueId){ |
|
|
|
@ -642,32 +596,12 @@ |
|
|
|
$.modal.openOptions(options); |
|
|
|
} |
|
|
|
/* 删除指定表格行 */ |
|
|
|
function removeRow(index){ |
|
|
|
function removeRow(materialId){ |
|
|
|
$("#bootstrap-sub-table-editOrder4").bootstrapTable('remove', { |
|
|
|
field: 'index', |
|
|
|
value: index |
|
|
|
field: 'materialId', |
|
|
|
values: materialId |
|
|
|
}) |
|
|
|
} |
|
|
|
$("input[name='pricingDate']").datetimepicker({ |
|
|
|
format: "yyyy-mm-dd", |
|
|
|
minView: "month", |
|
|
|
autoclose: true |
|
|
|
}); |
|
|
|
$("input[name='deliveryTime']").datetimepicker({ |
|
|
|
format: "yyyy-mm-dd", |
|
|
|
minView: "month", |
|
|
|
autoclose: true |
|
|
|
}); |
|
|
|
$("input[name='orderReceivingTime']").datetimepicker({ |
|
|
|
format: "yyyy-mm-dd", |
|
|
|
minView: "month", |
|
|
|
autoclose: true |
|
|
|
}); |
|
|
|
$("input[name='modificationTime']").datetimepicker({ |
|
|
|
format: "yyyy-mm-dd", |
|
|
|
minView: "month", |
|
|
|
autoclose: true |
|
|
|
}); |
|
|
|
//计算 |
|
|
|
function getTotalAmount(){ |
|
|
|
let getData = $("#bootstrap-sub-table-editOrder4").bootstrapTable('getData'); |
|
|
|
@ -727,6 +661,24 @@ |
|
|
|
minView: "month", |
|
|
|
autoclose: true |
|
|
|
}); |
|
|
|
|
|
|
|
function submitHandler() { |
|
|
|
if ($.validate.form()) { |
|
|
|
$("#p_B_reApply").val(); |
|
|
|
$("#reApply").val() |
|
|
|
var taskId = [[${taskId}]]; |
|
|
|
var tableData = $("#bootstrap-sub-table-editOrder4").bootstrapTable('getData'); |
|
|
|
if (tableData.length === 0) { |
|
|
|
$.modal.alertWarning("子表数据不能为空！"); |
|
|
|
} else { |
|
|
|
// 将子表数据添加到FormData中 |
|
|
|
$("#salesOrderChildList_modify").val(JSON.stringify(tableData)); |
|
|
|
var formData = $("#form-modify-audit").serialize(); |
|
|
|
// 发送请求 |
|
|
|
$.operate.save(prefix + "/complete/" + taskId, formData) |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
</script> |
|
|
|
</body> |
|
|
|
</html> |
zhangsiqi
4 months ago