Browse Source
新增 售后第一次维护设备添加出货设备前端页面 修改生产订单的添加设备履历列表查询条件再加上 物料号 新增 售后维护设备 根据物料号查询出货设备信息列表 售后维护设备 新增 展示售后第一次维护设备料号相关出货设备信息后端接口 售后维护设备 新增 展示售后第一次维护设备添加出货设备料号相关出货设备信息 修改售后维护设备第一次维护设备 物料列表展示页面，新增 申请出库数等字段 修改添加出货设备前端的方法 修改仓库准备物料前端修改保存方法，新增物料相关字段喝申请出库数相关字段 修改 保存销售单-准备物料 ，保存时更新 出库状态为 第一次维护设备信息dev
12 changed files with 412 additions and 197 deletions
@ -1,186 +0,0 @@ |
|||||
<!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-warehouseOutOrder-edit" th:object="${selectMaterialsVO}"> |
|
||||
<!-- <input name="quoteId" th:field="*{quoteId}" type="hidden">--> |
|
||||
<!-- <input name="materialCode" th:field="*{materialCode}" type="hidden">--> |
|
||||
<div class="col-sm-12 select-table table-striped"> |
|
||||
<h3 class="mb-4">物料信息</h3> |
|
||||
<table id="table-material"></table> |
|
||||
</div> |
|
||||
<div class="col-sm-12 select-table table-striped"> |
|
||||
<h3 class="mb-4">出货设备</h3> |
|
||||
<table id="table-shippingDevices"></table> |
|
||||
</div> |
|
||||
</form> |
|
||||
</div> |
|
||||
<th:block th:include="include :: footer" /> |
|
||||
<th:block th:include="include :: datetimepicker-js" /> |
|
||||
<script th:inline="javascript"> |
|
||||
// var addFlag = [[${@permission.hasPermi('aftersales:warehouseOutOrder:addShippingDevice')}]]; |
|
||||
// var addFlag = [[${@permission.hasPermi('aftersales:warehouseOutOrder:addShippingDevice')}]]; |
|
||||
|
|
||||
var prefix = ctx + "aftersales/warehouseOutOrder"; |
|
||||
var selectMaterialsVO = [[${selectMaterialsVO}]]; |
|
||||
|
|
||||
$("#form-warehouseOutOrder-edit").validate({ |
|
||||
focusCleanup: true |
|
||||
}); |
|
||||
|
|
||||
function submitHandler() { |
|
||||
if ($.validate.form()) { |
|
||||
$.operate.save(prefix + "/edit", $('#form-warehouseOutOrder-edit').serialize()); |
|
||||
} |
|
||||
} |
|
||||
|
|
||||
$("input[name='outOrderTime']").datetimepicker({ |
|
||||
format: "yyyy-mm-dd", |
|
||||
minView: "month", |
|
||||
autoclose: true |
|
||||
}); |
|
||||
|
|
||||
$("input[name='planDeliveryTime']").datetimepicker({ |
|
||||
format: "yyyy-mm-dd", |
|
||||
minView: "month", |
|
||||
autoclose: true |
|
||||
}); |
|
||||
|
|
||||
/*物料信息列表*/ |
|
||||
$(function() { |
|
||||
// 物料信息 |
|
||||
$('#table-material').bootstrapTable('destroy'); |
|
||||
var materialOptions = { |
|
||||
id:"table-material", |
|
||||
url: prefix + "/addShippingDevicesMaterial", |
|
||||
modalName: "物料信息", |
|
||||
showColumns: false, |
|
||||
pagination: false, |
|
||||
showToggle: false, |
|
||||
showRefresh:false, |
|
||||
showSearch:false, |
|
||||
queryParams:queryParams, |
|
||||
columns: [{ |
|
||||
checkbox: true |
|
||||
}, |
|
||||
{ title:'销售订单号', |
|
||||
field:'quoteId', |
|
||||
visible: false |
|
||||
}, |
|
||||
{ |
|
||||
title: '料号', |
|
||||
field: 'materialCode', |
|
||||
}, |
|
||||
{ |
|
||||
title: '图片', |
|
||||
field: 'photoUrl', |
|
||||
}, |
|
||||
{ |
|
||||
title: '物料名称', |
|
||||
field: 'materialName', |
|
||||
}, |
|
||||
{ |
|
||||
title: '物料类型', |
|
||||
field: 'materialType', |
|
||||
}, |
|
||||
{ |
|
||||
title: '单位', |
|
||||
field: 'materialUnit', |
|
||||
}, |
|
||||
{ |
|
||||
title: '品牌', |
|
||||
field: 'brand', |
|
||||
}, |
|
||||
{ |
|
||||
title: '描述', |
|
||||
field: 'describe', |
|
||||
}, |
|
||||
] |
|
||||
}; |
|
||||
$.table.init(materialOptions); |
|
||||
|
|
||||
}) |
|
||||
function queryParams(params) { |
|
||||
var curParams = { |
|
||||
// 传递参数查询参数 |
|
||||
quoteId: selectMaterialsVO.quoteId, |
|
||||
materialCode: selectMaterialsVO.materialCode, |
|
||||
}; |
|
||||
return curParams; |
|
||||
} |
|
||||
|
|
||||
/* 出货设备列表 */ |
|
||||
$(function() { |
|
||||
// 物料信息 |
|
||||
$('#table-shippingDevices').bootstrapTable('destroy'); |
|
||||
var shippingDevicesOptions = { |
|
||||
id: "table-shippingDevices", |
|
||||
url: prefix + "/addShippingDevicesOptions", |
|
||||
modalName: "物料信息", |
|
||||
showColumns: false, |
|
||||
pagination: false, |
|
||||
showToggle: false, |
|
||||
showRefresh: false, |
|
||||
showSearch: false, |
|
||||
queryParams:shippingDevicesQueryParams, |
|
||||
columns: [ |
|
||||
{ |
|
||||
checkbox: true // 保留原有全选checkbox |
|
||||
}, |
|
||||
{ |
|
||||
title: '销售订单号', |
|
||||
field: 'quoteId', |
|
||||
visible: false |
|
||||
}, |
|
||||
{ |
|
||||
title: '出货设备ID', |
|
||||
field: 'shippingDeviceId', |
|
||||
}, |
|
||||
{ |
|
||||
title: '设备型号', |
|
||||
field: 'deviceModelCode', |
|
||||
}, |
|
||||
{ |
|
||||
title: '流水号', |
|
||||
field: 'deviceRunningNumber', |
|
||||
}, |
|
||||
{ |
|
||||
title: '生产图片', |
|
||||
field: 'makePhotoUrl', |
|
||||
}, |
|
||||
{ |
|
||||
title: '确认添加', // 修改标题为操作 |
|
||||
align: 'center', |
|
||||
// formatter: function(value, row, index) { |
|
||||
// // 自定义操作列内容，包含一个确认添加按钮和一个独立的checkbox |
|
||||
// var checkboxHtml = '<input type="checkbox" value="' + row.shippingDeviceId + '" class="custom-checkbox">'; |
|
||||
// var addButtonHtml = '<a class="btn btn-success btn-xs ' + addFlag + '" href="javascript:void(0)" onclick="addShippingDevices(\'' + row.materialCode + '\')"><i class="fa fa-add"></i>添加出货设备</a>'; |
|
||||
// return checkboxHtml + ' ' + addButtonHtml; |
|
||||
// }, |
|
||||
// events: { // 添加事件处理器 |
|
||||
// 'click .custom-checkbox': function(e, value, row, index) { |
|
||||
// // 这里可以添加点击checkbox时的处理逻辑 |
|
||||
// var checkbox = e.target; |
|
||||
// console.log("Checkbox for device ID: " + row.shippingDeviceId + " was clicked. Checked: " + checkbox.checked); |
|
||||
// } |
|
||||
// } |
|
||||
} |
|
||||
] |
|
||||
}; |
|
||||
$.table.init(shippingDevicesOptions); |
|
||||
}); |
|
||||
|
|
||||
function shippingDevicesQueryParams(params) { |
|
||||
var curParams = { |
|
||||
// 传递参数查询参数 |
|
||||
quoteId: selectMaterialsVO.quoteId, |
|
||||
}; |
|
||||
return curParams; |
|
||||
} |
|
||||
</script> |
|
||||
</body> |
|
||||
</html> |
|
||||
@ -0,0 +1,273 @@ |
|||||
|
<!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-addShippingDevicesOne-edit" th:object="${warehouseOutOrderDetail}"> |
||||
|
<div class="form-group"> |
||||
|
<label class="col-sm-4 control-label">料号：</label> |
||||
|
<div class="col-sm-8"> |
||||
|
<input readonly name="materialNo" th:field="*{materialNo}" class="form-control" type="text"> |
||||
|
</div> |
||||
|
</div> |
||||
|
|
||||
|
<div class="form-group"> |
||||
|
<label class="col-sm-4 control-label">图片：</label> |
||||
|
<div class="col-sm-8"> |
||||
|
<input readonly name="materialPhotoUrl" th:field="*{materialPhotoUrl}" class="form-control" type="text"> |
||||
|
</div> |
||||
|
</div> |
||||
|
|
||||
|
<div class="form-group"> |
||||
|
<label class="col-sm-4 control-label">物料名称：</label> |
||||
|
<div class="col-sm-8"> |
||||
|
<input readonly name="materialName" th:field="*{materialName}" class="form-control" type="text"> |
||||
|
</div> |
||||
|
</div> |
||||
|
|
||||
|
<!-- <div class="form-group">--> |
||||
|
<!-- <label class="col-sm-4 control-label">物料类型：</label>--> |
||||
|
<!-- <div class="col-sm-8">--> |
||||
|
<!-- <input readonly name="materialType" th:field="*{materialType}" class="form-control" type="text">--> |
||||
|
<!-- </div>--> |
||||
|
<!-- </div>--> |
||||
|
<!-- <div class="form-group">--> |
||||
|
<!-- <label class="col-sm-4 control-label">物料类别：</label>--> |
||||
|
<!-- <div class="col-sm-8">--> |
||||
|
<!-- <input readonly name="materialClass" th:field="*{materialClass}" class="form-control" type="text">--> |
||||
|
<!-- </div>--> |
||||
|
<!-- </div>--> |
||||
|
|
||||
|
<div class="form-group"> |
||||
|
<label class="col-sm-4 control-label">型号：</label> |
||||
|
<div class="col-sm-8"> |
||||
|
<input readonly name="materialModel" th:field="*{materialModel}" class="form-control" type="text"> |
||||
|
</div> |
||||
|
</div> |
||||
|
|
||||
|
|
||||
|
<div class="form-group"> |
||||
|
<label class="col-sm-4 control-label">规格：</label> |
||||
|
<div class="col-sm-8"> |
||||
|
<input readonly name="materialSpecification" th:field="*{materialSpecification}" class="form-control" |
||||
|
type="text"> |
||||
|
</div> |
||||
|
</div> |
||||
|
|
||||
|
|
||||
|
<div class="form-group"> |
||||
|
<label class="col-sm-4 control-label">单位：</label> |
||||
|
<div class="col-sm-8"> |
||||
|
<input readonly name="materialUnit" th:field="*{materialUnit}" class="form-control" type="text"> |
||||
|
</div> |
||||
|
</div> |
||||
|
|
||||
|
<div class="form-group"> |
||||
|
<label class="col-sm-4 control-label">品牌：</label> |
||||
|
<div class="col-sm-8"> |
||||
|
<input readonly name="materialBrand" th:field="*{materialBrand}" class="form-control" type="text"> |
||||
|
</div> |
||||
|
</div> |
||||
|
|
||||
|
<div class="form-group"> |
||||
|
<label class="col-sm-4 control-label">描述：</label> |
||||
|
<div class="col-sm-8"> |
||||
|
<input readonly name="materialDescribe" th:field="*{materialDescribe}" class="form-control" type="text"> |
||||
|
</div> |
||||
|
</div> |
||||
|
<!-- <div class="col-sm-12 select-table table-striped">--> |
||||
|
<!-- <h3 class="mb-4">物料信息</h3>--> |
||||
|
<!-- <table id="table-material"></table>--> |
||||
|
<!-- </div>--> |
||||
|
|
||||
|
|
||||
|
</form> |
||||
|
<div class="container"> |
||||
|
<!-- 选择出货设备 --> |
||||
|
<div class="row"> |
||||
|
|
||||
|
<div class="col-sm-12 select-table table-striped"> |
||||
|
<h3 class="mb-4">出货设备</h3> |
||||
|
<table id="table-shippingDevices"></table> |
||||
|
</div> |
||||
|
</div> |
||||
|
</div> |
||||
|
|
||||
|
|
||||
|
</div> |
||||
|
<th:block th:include="include :: footer" /> |
||||
|
<th:block th:include="include :: datetimepicker-js" /> |
||||
|
<script th:inline="javascript"> |
||||
|
// var addFlag = [[${@permission.hasPermi('aftersales:warehouseOutOrder:addShippingDevice')}]]; |
||||
|
// var addFlag = [[${@permission.hasPermi('aftersales:warehouseOutOrder:addShippingDevice')}]]; |
||||
|
|
||||
|
var prefix = ctx + "aftersales/warehouseOutOrder"; |
||||
|
var warehouseOutOrderDetail = [[${warehouseOutOrderDetail}]]; |
||||
|
|
||||
|
$("#form-addShippingDevicesOne-edit").validate({ |
||||
|
focusCleanup: true |
||||
|
}); |
||||
|
|
||||
|
function submitHandler() { |
||||
|
if ($.validate.form()) { |
||||
|
$.operate.save(prefix + "/edit", $('#form-addShippingDevicesOne-edit').serialize()); |
||||
|
} |
||||
|
} |
||||
|
|
||||
|
$("input[name='outOrderTime']").datetimepicker({ |
||||
|
format: "yyyy-mm-dd", |
||||
|
minView: "month", |
||||
|
autoclose: true |
||||
|
}); |
||||
|
|
||||
|
$("input[name='planDeliveryTime']").datetimepicker({ |
||||
|
format: "yyyy-mm-dd", |
||||
|
minView: "month", |
||||
|
autoclose: true |
||||
|
}); |
||||
|
// |
||||
|
// /*物料信息列表*/ |
||||
|
// $(function() { |
||||
|
// // 物料信息 |
||||
|
// $('#table-material').bootstrapTable('destroy'); |
||||
|
// var materialOptions = { |
||||
|
// id:"table-material", |
||||
|
// url: prefix + "/addShippingDevicesMaterial", |
||||
|
// modalName: "物料信息", |
||||
|
// showColumns: false, |
||||
|
// pagination: false, |
||||
|
// showToggle: false, |
||||
|
// showRefresh:false, |
||||
|
// showSearch:false, |
||||
|
// queryParams:queryParams, |
||||
|
// columns: [{ |
||||
|
// checkbox: true |
||||
|
// }, |
||||
|
// { title:'销售订单号', |
||||
|
// field:'quoteId', |
||||
|
// visible: false |
||||
|
// }, |
||||
|
// { |
||||
|
// title: '料号', |
||||
|
// field: 'materialCode', |
||||
|
// }, |
||||
|
// { |
||||
|
// title: '图片', |
||||
|
// field: 'photoUrl', |
||||
|
// }, |
||||
|
// { |
||||
|
// title: '物料名称', |
||||
|
// field: 'materialName', |
||||
|
// }, |
||||
|
// { |
||||
|
// title: '物料类型', |
||||
|
// field: 'materialType', |
||||
|
// }, |
||||
|
// { |
||||
|
// title: '单位', |
||||
|
// field: 'materialUnit', |
||||
|
// }, |
||||
|
// { |
||||
|
// title: '品牌', |
||||
|
// field: 'brand', |
||||
|
// }, |
||||
|
// { |
||||
|
// title: '描述', |
||||
|
// field: 'describe', |
||||
|
// }, |
||||
|
// ] |
||||
|
// }; |
||||
|
// $.table.init(materialOptions); |
||||
|
// |
||||
|
// }) |
||||
|
// function queryParams(params) { |
||||
|
// var curParams = { |
||||
|
// // 传递参数查询参数 |
||||
|
// quoteId: selectMaterialsVO.quoteId, |
||||
|
// materialCode: selectMaterialsVO.materialCode, |
||||
|
// }; |
||||
|
// return curParams; |
||||
|
// } |
||||
|
|
||||
|
$(function(){ |
||||
|
|
||||
|
var options = { |
||||
|
id: "form-equipMaterialDetail-add", |
||||
|
url: prefix + "/getEquipMaterialDetailByMaterialNo", |
||||
|
pagination: false, |
||||
|
showSearch: false, |
||||
|
showRefresh: false, |
||||
|
showToggle: false, |
||||
|
showColumns: false, |
||||
|
queryParams:queryParams, |
||||
|
sidePagination: "client", |
||||
|
columns: [{ |
||||
|
checkbox: true |
||||
|
}, |
||||
|
{ |
||||
|
field: 'equipmentIndex', |
||||
|
align: 'center', |
||||
|
title: "序号", |
||||
|
formatter: function (value, row, index) { |
||||
|
// 使用bootstrap-table的内置序号生成 |
||||
|
return index + 1; |
||||
|
} |
||||
|
}, |
||||
|
{ |
||||
|
field: 'equipmentId', |
||||
|
align: 'center', |
||||
|
title: '出货设备id', |
||||
|
}, |
||||
|
{ |
||||
|
field: 'equipmentModel', |
||||
|
align: 'center', |
||||
|
title: '设备型号', |
||||
|
}, |
||||
|
{ |
||||
|
field: 'serialNo', |
||||
|
align: 'center', |
||||
|
title: '流水号', |
||||
|
}, |
||||
|
{ |
||||
|
field: 'producePic', |
||||
|
align: 'center', |
||||
|
title: '生产图片', |
||||
|
}, |
||||
|
{ |
||||
|
title: '操作', |
||||
|
align: 'center', |
||||
|
formatter: function (value, row, index) { |
||||
|
return '<a class="btn btn-danger btn-xs" href="javascript:void(0)" onclick="removeRow(' + index + ')"><i class="fa fa-remove"></i>删除</a>'; |
||||
|
} |
||||
|
} |
||||
|
|
||||
|
] |
||||
|
}; |
||||
|
$.table.init(options); |
||||
|
|
||||
|
}) |
||||
|
|
||||
|
function queryParams(params) { |
||||
|
var curParams = { |
||||
|
// 传递参数查询参数 |
||||
|
materialNo: warehouseOutOrderDetail.materialNo |
||||
|
}; |
||||
|
return curParams; |
||||
|
} |
||||
|
|
||||
|
function removeRow(index) { |
||||
|
var data = $('#form-equipMaterialDetail-add').bootstrapTable('getData'); |
||||
|
var row = data[index]; // 获取要删除的行数据 |
||||
|
if (row) { |
||||
|
$('#form-equipMaterialDetail-add').bootstrapTable('remove', { |
||||
|
field: 'equipmentIndex', |
||||
|
values: [row.equipmentIndex] |
||||
|
}); |
||||
|
} |
||||
|
} |
||||
|
</script> |
||||
|
</body> |
||||
|
</html> |
||||
Loading…
Reference in new issue