Browse Source
出库单 新增销售-出库 按钮 新增销售出库页面salesOutWarehouse.html 新增销售出库后端查询页面接口 新增销售出库后端修改保存接口 新增查询销售出库物料信息关联设备信息 设备履历数据库新增 型号和规格字段 销售单准备物料 prepareMaterial.html页面 设置多个字段为不可选择项dev
12 changed files with 436 additions and 10 deletions
@ -0,0 +1,304 @@ |
|||
<!DOCTYPE html> |
|||
<html lang="zh" xmlns:th="http://www.thymeleaf.org" > |
|||
<head> |
|||
<th:block th:include="include :: header('修改仓库出库单')" /> |
|||
<th:block th:include="include :: datetimepicker-css" /> |
|||
</head> |
|||
<body class="white-bg"> |
|||
<div class="wrapper wrapper-content animated fadeInRight ibox-content"> |
|||
<form class="form-horizontal m" id="form-prepareMaterial-edit" th:object="${warehouseOutOrder}"> |
|||
<input name="outOrderId" th:field="*{outOrderId}" type="hidden"> |
|||
<div class="form-group"> |
|||
<label class="col-sm-3 control-label">出库单号：</label> |
|||
<div class="col-sm-8"> |
|||
<input name="outOrderCode" th:field="*{outOrderCode}" class="form-control" type="text" disabled> |
|||
</div> |
|||
</div> |
|||
<div class="form-group"> |
|||
<label class="col-sm-3 control-label">订单类型：</label> |
|||
<div class="col-sm-8"> |
|||
<select name="warehouseOrderType" class="form-control m-b" th:with="type=${@dict.getType('warehouse_order_type')}" disabled> |
|||
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{warehouseOrderType}"></option> |
|||
</select> |
|||
</div> |
|||
</div> |
|||
<div class="form-group"> |
|||
<label class="col-sm-3 control-label">销售订单号：</label> |
|||
<div class="col-sm-8"> |
|||
<input name="salesOrderCode" th:field="*{salesOrderCode}" class="form-control" type="text" disabled> |
|||
</div> |
|||
</div> |
|||
<div class="form-group"> |
|||
<label class="col-sm-3 control-label">申请人员：</label> |
|||
<div class="col-sm-8"> |
|||
<input name="applyName" th:field="*{applyName}" class="form-control" type="text" disabled> |
|||
</div> |
|||
</div> |
|||
<div class="form-group"> |
|||
<label class="col-sm-3 control-label">生产单号：</label> |
|||
<div class="col-sm-8"> |
|||
<input name="makeNo" th:field="*{makeNo}" class="form-control" type="text" disabled> |
|||
</div> |
|||
</div> |
|||
<div class="form-group"> |
|||
<label class="col-sm-3 control-label">送货日期：</label> |
|||
<div class="col-sm-8"> |
|||
<div class="input-group date"> |
|||
<input name="deliveryDate" th:value="${#dates.format(warehouseOutOrder.deliveryDate, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text" disabled> |
|||
<span class="input-group-addon"><i class="fa fa-calendar"></i></span> |
|||
</div> |
|||
</div> |
|||
</div> |
|||
<div class="form-group"> |
|||
<label class="col-sm-3 control-label">客户ID：</label> |
|||
<div class="col-sm-8"> |
|||
<input name="customerId" th:field="*{customerId}" class="form-control" type="text" disabled> |
|||
</div> |
|||
</div> |
|||
<div class="form-group"> |
|||
<label class="col-sm-3 control-label">客户名称：</label> |
|||
<div class="col-sm-8"> |
|||
<input name="customerName" th:field="*{customerName}" class="form-control" type="text" disabled> |
|||
</div> |
|||
</div> |
|||
<div class="form-group"> |
|||
<label class="col-sm-3 control-label">收货联系人：</label> |
|||
<div class="col-sm-8"> |
|||
<input name="deliveryName" th:field="*{deliveryName}" class="form-control" type="text" disabled> |
|||
</div> |
|||
</div> |
|||
<div class="form-group"> |
|||
<label class="col-sm-3 control-label">收货电话：</label> |
|||
<div class="col-sm-8"> |
|||
<input name="deliveryNumber" th:field="*{deliveryNumber}" class="form-control" type="text" disabled> |
|||
</div> |
|||
</div> |
|||
<div class="form-group"> |
|||
<label class="col-sm-3 control-label">收货地址：</label> |
|||
<div class="col-sm-8"> |
|||
<input name="deliveryAddress" th:field="*{deliveryAddress}" class="form-control" type="text" disabled> |
|||
</div> |
|||
</div> |
|||
<div class="form-group"> |
|||
<label class="col-sm-3 control-label">备注：</label> |
|||
<div class="col-sm-8"> |
|||
<input name="remark" th:field="*{remark}" class="form-control" type="text"> |
|||
</div> |
|||
</div> |
|||
</form> |
|||
<!--物料信息--> |
|||
<div class="container"> |
|||
<div class="row"> |
|||
<div class="col-sm-12 select-table table-striped"> |
|||
<table id="bootstrap-table"></table> |
|||
</div> |
|||
</div> |
|||
</div> |
|||
</div> |
|||
<th:block th:include="include :: footer" /> |
|||
<th:block th:include="include :: datetimepicker-js" /> |
|||
<!--用于可以修改列表字段的插件--> |
|||
<th:block th:include="include :: bootstrap-table-editable-js" /> |
|||
<script th:inline="javascript"> |
|||
|
|||
|
|||
var warehouseOutOrder = [[${warehouseOutOrder}]]; |
|||
|
|||
var prefix = ctx + "warehouse/warehouseOutOrder"; |
|||
|
|||
|
|||
// $("input[name='deliveryDate']").datetimepicker({ |
|||
// format: "yyyy-mm-dd HH:mm:ss", |
|||
// minView: "month", |
|||
// autoclose: true |
|||
// }); |
|||
|
|||
$("#form-prepareMaterial-edit").validate({ |
|||
focusCleanup: true |
|||
}); |
|||
|
|||
|
|||
|
|||
// 新增提交 |
|||
function submitHandler() { |
|||
// 获取表单数据 |
|||
const warehouseOutOrderData = $("#form-prepareMaterial-edit").serializeArray().reduce((obj, item) => { |
|||
obj[item.name] = item.value; |
|||
return obj; |
|||
}, {}); |
|||
// 获取bootstrap-table的数据，这里假设你使用bootstrap-table的API获取所有数据 |
|||
var table = $('#bootstrap-table').bootstrapTable('getData'); |
|||
|
|||
// 将表数据转换成与complaintNoticeData格式一致的数组 |
|||
var materialDataList = table.map(function(item) { |
|||
// 根据实际字段名调整 |
|||
return { |
|||
"outOrderDetailId":item.outOrderDetailId, |
|||
"outOrderCode":item.outOrderCode, |
|||
"materialNo": item.materialNo, // 假设id对应materialId |
|||
"prepareOutOrderSum":item.prepareOutOrderSum, |
|||
"actualOutOrderSum":item.actualOutOrderSum |
|||
// ...其他字段 |
|||
}; |
|||
}); |
|||
|
|||
const combinedData = Object.assign({}, warehouseOutOrderData, { |
|||
warehouseOutOrderDetailList: materialDataList, |
|||
}); |
|||
// 合并表单数据和表格数据 |
|||
console.log(combinedData) |
|||
// 使用 JSON.stringify() 序列化数据 |
|||
const jsonData = JSON.stringify(combinedData); |
|||
// 发送 AJAX 请求到后端接口 |
|||
$.operate.saveJson(prefix + "/prepareMaterial", jsonData); |
|||
} |
|||
|
|||
//物料信息展示列表 |
|||
$(function() { |
|||
var options = { |
|||
modalName: "选择物料", |
|||
url: ctx + "warehouse/warehouseOutOrder/getMaterialListByOutOrderCode", |
|||
queryParams: queryParams, |
|||
showSearch: false, |
|||
showRefresh: false, |
|||
showToggle: false, |
|||
showColumns: false, |
|||
pagination: false, // 设置不分页 |
|||
detailView: true, |
|||
//指定父id列 |
|||
onExpandRow : function(index, row, $detail) { |
|||
$detail.html('<table class="table-container" id="one_level_table_'+row.outOrderDetailId+'"></table>' |
|||
).find('table'); |
|||
// 一阶 |
|||
initOneLevelTable(index,row,$detail); |
|||
}, |
|||
columns: [{ |
|||
checkbox: true |
|||
}, |
|||
{ |
|||
title: '出库单详情ID', |
|||
field: 'outOrderDetailId', |
|||
visible: false |
|||
}, |
|||
{ |
|||
title: '销售单号', |
|||
field: 'salesOrderCode', |
|||
visible: false |
|||
|
|||
}, |
|||
{ |
|||
title: '出库单号', |
|||
field: 'outOrderCode', |
|||
visible: false |
|||
}, |
|||
|
|||
{ |
|||
title: '料号', |
|||
field: 'materialNo', |
|||
}, |
|||
{ |
|||
title: '图片', |
|||
field: 'materialPhotourl', |
|||
}, |
|||
{ |
|||
title: '物料名称', |
|||
field: 'materialName', |
|||
}, |
|||
{ |
|||
title: '物料类型', |
|||
field: 'materialType', |
|||
}, |
|||
{ |
|||
title: '描述', |
|||
field: 'materialDescribe', |
|||
}, |
|||
{ |
|||
title: '品牌', |
|||
field: 'materialBrand', |
|||
}, |
|||
{ |
|||
title: '单位', |
|||
field: 'materialUnit', |
|||
}, |
|||
{ |
|||
title: '加工方式', |
|||
field: 'materialProcessMethod', |
|||
}, |
|||
{ |
|||
title: '订单数量', |
|||
field: 'makeNum', |
|||
}, |
|||
{ |
|||
title: '已出库数', |
|||
field: 'hasOutOrderSum', |
|||
}, |
|||
{ |
|||
title: '申请出库数', |
|||
field: 'applyOutOrderSum', |
|||
}, |
|||
{ |
|||
title: '准备出库数', |
|||
field: 'prepareOutOrderSum', |
|||
}, |
|||
{ |
|||
title: '实际出库数', |
|||
field: 'actualOutOrderSum', |
|||
editable:true |
|||
} |
|||
] |
|||
}; |
|||
$.table.init(options); |
|||
}); |
|||
|
|||
function queryParams(params) { |
|||
var curParams = { |
|||
// 传递参数查询参数 |
|||
outOrderCode: warehouseOutOrder.outOrderCode |
|||
}; |
|||
console.log(curParams); |
|||
return curParams; |
|||
} |
|||
|
|||
initOneLevelTable = function(index, row, $detail) { |
|||
$("#"+"one_level_table_"+row.outOrderDetailId).bootstrapTable({ |
|||
url: prefix + "/getShippingDeviceList", |
|||
method: 'post', |
|||
sidePagination: "server", |
|||
contentType: "application/x-www-form-urlencoded", |
|||
queryParams : { |
|||
salesOrderCode: row.salesOrderCode, |
|||
materialNo: row.materialNo, |
|||
}, |
|||
columns: [ |
|||
{ |
|||
field: 'shippingDeviceId', |
|||
title: '设备ID', |
|||
}, |
|||
|
|||
{ |
|||
field: 'deviceModelCode', |
|||
title: '设备型号', |
|||
}, |
|||
{ |
|||
field: 'snCode', |
|||
title: '设备SN', |
|||
}, |
|||
{ |
|||
field: 'aftersalesPhotoUrl', |
|||
title: '售后图片', |
|||
}, |
|||
|
|||
{ |
|||
field: 'guaranteePeriod', |
|||
title: '保修期', |
|||
}, |
|||
{ |
|||
field: 'factoryDate', |
|||
title: '出厂日期', |
|||
}] |
|||
}); |
|||
}; |
|||
|
|||
</script> |
|||
</body> |
|||
</html> |
|||
Loading…
Reference in new issue