Browse Source
新增 生产入库品质单详情前端页面 新增 生产入库品质单报告前端页面 新增 生产入库品质单品质按钮按照一定条件进行显示 新增 生产入库品质单详情按钮按照一定条件进行显示 新增修改保存 生产入库品质单品质后端接口 新增修改保存 生产入库品质单品质报告后端接口 新增 品质单品质后生产仓库入库单后端接口 新增 生产入库时更新生产订单本次已完成数后端接口 去掉委内入库新增品质不合格分类 去掉至少添加一条不合格数的提示 去掉生产入库新增品质不合格分类 去掉至少添加一条不合格数的提示dev
11 changed files with 864 additions and 9 deletions
@ -0,0 +1,311 @@ |
|||
<!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-makeOrderReport-edit" th:object="${qualityOrderReport}"> |
|||
<input name="qualityOrderReportId" th:field="*{qualityOrderReportId}" type="hidden"> |
|||
<div class="form-group"> |
|||
<label class="col-sm-3 control-label">料号：</label> |
|||
<div class="col-sm-6"> |
|||
<input name="materialNo" th:field="*{materialNo}" class="form-control" type="text"> |
|||
</div> |
|||
</div> |
|||
<div class="form-group"> |
|||
<label class="col-sm-3 control-label">物料名称：</label> |
|||
<div class="col-sm-6"> |
|||
<input name="materialName" th:field="*{materialName}" class="form-control" type="text"> |
|||
</div> |
|||
</div> |
|||
<div class="form-group"> |
|||
<label class="col-sm-3 control-label">生产订单数：</label> |
|||
<div class="col-sm-6"> |
|||
<input name="makeTotal" th:field="*{makeTotal}" class="form-control" type="text"> |
|||
</div> |
|||
</div> |
|||
<div class="form-group"> |
|||
<label class="col-sm-3 control-label">品质已合格数：</label> |
|||
<div class="col-sm-6"> |
|||
<input name="qualityHasqualifiedNum" th:field="*{qualityHasqualifiedNum}" class="form-control" type="text"> |
|||
</div> |
|||
</div> |
|||
|
|||
<div class="container"> |
|||
<!--合格数--> |
|||
<div class="col-sm-12"> |
|||
<h3>合格数</h3> |
|||
<div class="row"> |
|||
<div class="form-group col-sm-6"> |
|||
<label class="control-label is-required">ok允收数：</label> |
|||
<input name="okAcceptedNum" th:field="*{okAcceptedNum}" class="form-control" type="text" required> |
|||
</div> |
|||
<div class="form-group col-sm-6"> |
|||
<label class="control-label">ok报告图片：</label> |
|||
<input name="okReportUrl" th:field="*{okReportUrl}" class="form-control" type="text"> |
|||
</div> |
|||
</div> |
|||
<div class="row"> |
|||
<div class="form-group col-sm-6"> |
|||
<label class="control-label is-required">特采/让步数：</label> |
|||
<input name="specialConcessionsNum" th:field="*{specialConcessionsNum}" class="form-control" type="text" required> |
|||
</div> |
|||
<div class="form-group col-sm-6"> |
|||
<label class="control-label">特采报告图片：</label> |
|||
<input name="specialReportUrl" th:field="*{specialReportUrl}" class="form-control" type="text"> |
|||
</div> |
|||
</div> |
|||
</div> |
|||
<!--不合格数--> |
|||
<div class="col-sm-12"> |
|||
<div class="row"> |
|||
<div class="col-sm-12 d-flex align-items-center"> |
|||
<span style="font-weight: bold; font-family: Arial, sans-serif; font-size: 15px;">不合格数</span> |
|||
<a class="btn btn-success ml-auto" onclick="addUnqualified()"> |
|||
<i class="fa fa-plus"></i> 添加 |
|||
</a> |
|||
</div> |
|||
</div> |
|||
<div class="row"> |
|||
<div class="col-sm-12 select-table table-striped"> |
|||
<table id="bootstrap-unqualified-table"></table> |
|||
</div> |
|||
</div> |
|||
</div> |
|||
|
|||
</div> |
|||
|
|||
<!--其他字段--> |
|||
<div class="form-group"> |
|||
<label class="col-sm-4 control-label">检验完成时间：</label> |
|||
<div class="col-sm-8"> |
|||
<div class="input-group date"> |
|||
<input name="checkoutCompletionTime" th:value="${#dates.format(qualityOrderReport.checkoutCompletionTime, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text"> |
|||
<span class="input-group-addon"><i class="fa fa-calendar"></i></span> |
|||
</div> |
|||
</div> |
|||
</div> |
|||
<div class="form-group"> |
|||
<label class="col-sm-4 control-label">备注：</label> |
|||
<div class="col-sm-8"> |
|||
<textarea name="remark" th:field="*{remark}" class="form-control" type="text"></textarea> |
|||
</div> |
|||
</div> |
|||
</form> |
|||
</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 processBadClassificationDatas = [[${@dict.getType('process_bad_classification')}]]; |
|||
var processBadGradeDatas = [[${@dict.getType('process_bad_grade')}]]; |
|||
|
|||
var qualityOrderCode = /*[[${qualityOrderCode}]]*/ ''; |
|||
var $table = $("#bootstrap-unqualified-table"); |
|||
var prefix = ctx + "quality/qualityOrder"; |
|||
$("#form-makeOrderReport-edit").validate({ |
|||
focusCleanup: true |
|||
}); |
|||
|
|||
function submitHandler() { |
|||
if ($.validate.form()) { |
|||
// 获取表单数据 |
|||
const qualityReportData = $("#form-makeOrderReport-edit").serializeArray().reduce((obj, item) => { |
|||
obj[item.name] = item.value; |
|||
return obj; |
|||
}, {}); |
|||
// 获取bootstrap-table的数据，这里假设你使用bootstrap-table的API获取所有数据 |
|||
var table = $('#bootstrap-unqualified-table').bootstrapTable('getData'); |
|||
|
|||
console.log(JSON.stringify(table)); |
|||
// 将表数据转换成与qualityReportData格式一致的数组 |
|||
var unqualifiedDataList = table.map(function (item) { |
|||
// 根据实际字段名调整 |
|||
return { |
|||
"processBadClassification": item.processBadClassification, |
|||
"processBadGrade": item.processBadGrade, |
|||
"processBadNum": item.processBadNum, |
|||
"unqualifiedReportUrl": item.unqualifiedReportUrl |
|||
// ...其他字段 |
|||
}; |
|||
}); |
|||
|
|||
const combinedData = Object.assign({}, qualityReportData, |
|||
{unqualifiedDataList: unqualifiedDataList, |
|||
qualityOrderCode: qualityOrderCode // 直接使用全局变量 |
|||
}, |
|||
); |
|||
// 合并表单数据和表格数据 |
|||
// const combinedData = Object.assign({}, ...complaintNoticeData.array(item => ({ [item.name]: item.value })), ...materialData); |
|||
console.log(combinedData) |
|||
// 使用 JSON.stringify() 序列化数据 |
|||
const jsonData = JSON.stringify(combinedData); |
|||
// 发送 AJAX 请求到后端接口 |
|||
$.operate.saveJson(prefix + "/makeOrderReport", jsonData); |
|||
} |
|||
} |
|||
|
|||
$("input[name='checkoutCompletionTime']").datetimepicker({ |
|||
format: "yyyy-mm-dd", |
|||
minView: "month", |
|||
autoclose: true |
|||
}); |
|||
|
|||
|
|||
|
|||
//添加不合格数 |
|||
function addUnqualified() { |
|||
// 生成一个简单的唯一标识，这里使用时间戳作为示例 |
|||
var uniqueId = new Date().getTime(); |
|||
// 创建一个新行数据模板，这里仅为示例，具体根据表格列来定义 |
|||
var newRow = { |
|||
qualityOrderReportId:uniqueId, |
|||
processBadClassification: "", |
|||
processBadGrade: "", |
|||
processBadNum: "", |
|||
unqualifiedReportUrl: "" |
|||
}; |
|||
|
|||
// 使用Bootstrap Table的API插入新行 |
|||
$('#bootstrap-unqualified-table').bootstrapTable('append', newRow); |
|||
|
|||
} |
|||
//收款凭证table列表 |
|||
$(function() { |
|||
var options = { |
|||
id:"bootstrap-unqualified-table", |
|||
modalName: "收款凭证", |
|||
showColumns: false, |
|||
pagination: false, |
|||
showToggle: false, |
|||
showRefresh:false, |
|||
showSearch:false, |
|||
singleSelect:true, |
|||
columns: [{ |
|||
checkbox: false |
|||
}, |
|||
{ |
|||
title: '品质报告单id', |
|||
field: 'qualityOrderReportId', |
|||
visible: false |
|||
}, |
|||
|
|||
{title: '不良分类',field: 'processBadClassification', |
|||
formatter:function (value, row, index) { |
|||
return processBadClassificationFormatter(value,row,index); |
|||
} |
|||
}, |
|||
|
|||
{title: '不良等级',field: 'processBadGrade', |
|||
formatter:function (value, row, index) { |
|||
return processBadGradeFormatter(value,row,index); |
|||
} |
|||
}, |
|||
{ |
|||
title: '数量', |
|||
field: 'processBadNum', |
|||
editable:{ |
|||
type: 'text', |
|||
mode:'inline', |
|||
validate: function (v) { |
|||
if (!v) return '数量不能为空'; |
|||
if (isNaN(v)) return '数量必须是数字'; |
|||
var processBadNum = parseInt(v); |
|||
if (processBadNum < 0) return '数量必须是正整数'; |
|||
} |
|||
} |
|||
}, |
|||
{ |
|||
title: '报告', |
|||
field: 'unqualifiedReportUrl', |
|||
editable: { |
|||
mode:'inline', |
|||
type: 'text', // 表示该列可以被编辑为文本 |
|||
}, |
|||
}, |
|||
{ |
|||
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.qualityOrderReportId + '\')"><i class="fa fa-remove"></i>删除</a> '); |
|||
return actions.join(''); |
|||
} |
|||
} |
|||
] |
|||
}; |
|||
$.table.init(options); |
|||
}); |
|||
|
|||
|
|||
// 逻辑删除不合格数前端的一行数据 |
|||
function removeRow(qualityOrderReportId){ |
|||
console.log(qualityOrderReportId); |
|||
// 直接使用 receivablesRecordsId 值进行删除操作 |
|||
$("#bootstrap-unqualified-table").bootstrapTable('remove', { |
|||
field: 'qualityOrderReportId', |
|||
values: qualityOrderReportId |
|||
}); |
|||
} |
|||
|
|||
|
|||
// 列中获取不良分类的下拉改变数据 |
|||
function onProcessBadClassification(selectElement, rowIndex) { |
|||
var processBadClassificationValue = $(selectElement).val(); |
|||
var tableData = $table.bootstrapTable('getData'); |
|||
var newRow = tableData[rowIndex]; // 获取当前行数据 |
|||
// 重新渲染成本小类的设备名称列 |
|||
// 更新行数据 |
|||
newRow.processBadClassification = processBadClassificationValue; |
|||
$table.bootstrapTable('updateRow', {index: rowIndex, row: newRow}); |
|||
} |
|||
|
|||
// 自定义不良分类的格式化函数 |
|||
function processBadClassificationFormatter(value, row, index) { |
|||
var selectHtml = '<select class="form-control" onchange="onProcessBadClassification(this, ' + index + ')">'; |
|||
|
|||
// 添加默认选项 |
|||
selectHtml += '<option value=""' + (value === undefined || value === '' ? ' selected' : '') + '>所有</option>'; |
|||
|
|||
processBadClassificationDatas.forEach(function (child) { |
|||
selectHtml += '<option value="' + child.dictValue + '"' + (value === child.dictValue ? ' selected' : '') + '>' + child.dictLabel + '</option>'; |
|||
}); |
|||
|
|||
selectHtml += '</select>'; |
|||
return selectHtml; |
|||
} |
|||
|
|||
|
|||
|
|||
// 列中获取不良等级的下拉改变数据 |
|||
function onProcessBadGrade(selectElement, rowIndex) { |
|||
var processBadGradeValue = $(selectElement).val(); |
|||
var tableData = $table.bootstrapTable('getData'); |
|||
var newRow = tableData[rowIndex]; // 获取当前行数据 |
|||
// 重新渲染成本小类的设备名称列 |
|||
// 更新行数据 |
|||
newRow.processBadGrade = processBadGradeValue; |
|||
$table.bootstrapTable('updateRow', {index: rowIndex, row: newRow}); |
|||
} |
|||
|
|||
// 自定义不良等级的格式化函数 |
|||
function processBadGradeFormatter(value, row, index) { |
|||
var selectHtml = '<select class="form-control" onchange="onProcessBadGrade(this, ' + index + ')">'; |
|||
|
|||
// 添加默认选项 |
|||
selectHtml += '<option value=""' + (value === undefined || value === '' ? ' selected' : '') + '>所有</option>'; |
|||
|
|||
processBadGradeDatas.forEach(function (child) { |
|||
selectHtml += '<option value="' + child.dictValue + '"' + (value === child.dictValue ? ' selected' : '') + '>' + child.dictLabel + '</option>'; |
|||
}); |
|||
|
|||
selectHtml += '</select>'; |
|||
return selectHtml; |
|||
} |
|||
|
|||
</script> |
|||
</body> |
|||
</html> |
|||
@ -0,0 +1,255 @@ |
|||
<!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-makeInStartingQuality-edit" th:object="${qualityOrder}"> |
|||
<input name="qualityOrderId" th:field="*{qualityOrderId}" type="hidden"> |
|||
<div class="form-group"> |
|||
<label class="col-sm-3 control-label">品质单号：</label> |
|||
<div class="col-sm-8"> |
|||
<input name="qualityOrderCode" th:field="*{qualityOrderCode}" class="form-control" type="text"> |
|||
</div> |
|||
</div> |
|||
<div class="form-group"> |
|||
<label class="col-sm-3 control-label">入库单号：</label> |
|||
<div class="col-sm-8"> |
|||
<input name="inStorageCode" th:field="*{inStorageCode}" class="form-control" type="text"> |
|||
</div> |
|||
</div> |
|||
<div class="form-group"> |
|||
<label class="col-sm-3 control-label">关联订单号：</label> |
|||
<div class="col-sm-8"> |
|||
<input name="relatedOrderCode" th:field="*{relatedOrderCode}" class="form-control" type="text"> |
|||
</div> |
|||
</div> |
|||
<div class="form-group"> |
|||
<label class="col-sm-3 control-label">品质单订单类型：</label> |
|||
<div class="col-sm-8"> |
|||
<select name="qualityOrderType" class="form-control m-b" th:with="type=${@dict.getType('quality_order_type')}"> |
|||
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{qualityOrderType}"></option> |
|||
</select> |
|||
</div> |
|||
</div> |
|||
<div class="form-group"> |
|||
<label class="col-sm-3 control-label">品质单入库类型：</label> |
|||
<div class="col-sm-8"> |
|||
<select name="qualityStorageStatus" class="form-control m-b" th:with="type=${@dict.getType('quality_storage_status')}"> |
|||
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{qualityStorageStatus}"></option> |
|||
</select> |
|||
</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="deliveryInspectionTime" th:value="${#dates.format(qualityOrder.deliveryInspectionTime, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text"> |
|||
<span class="input-group-addon"><i class="fa fa-calendar"></i></span> |
|||
</div> |
|||
</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 qualityOrderCode = [[${qualityOrder.qualityOrderCode}]] |
|||
var qualityOrder = [[${qualityOrder}]] |
|||
var prefix = ctx + "quality/qualityOrder"; |
|||
$("#form-makeInStartingQuality-edit").validate({ |
|||
focusCleanup: true |
|||
}); |
|||
|
|||
$("input[name='deliveryInspectionTime']").datetimepicker({ |
|||
format: "yyyy-mm-dd", |
|||
minView: "month", |
|||
autoclose: true |
|||
}); |
|||
|
|||
|
|||
|
|||
// 新增提交 |
|||
function submitHandler() { |
|||
// 获取表单数据 |
|||
const qualityOrderData = $("#form-makeInStartingQuality-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 { |
|||
"qualityOrderDetailId": item.qualityOrderDetailId, |
|||
"materialNo": item.materialNo, |
|||
"materialNo": item.materialNo, |
|||
"materialName": item.materialName, |
|||
"materialType": item.materialType, |
|||
"materialPhotourl": item.materialPhotourl, |
|||
"materialDescribe": item.materialDescribe, |
|||
"materialBrand": item.materialBrand, |
|||
"materialUnit": item.materialUnit, |
|||
"materialProcessMethod": item.materialProcessMethod, |
|||
"thisArrivedNum": item.thisArrivedNum, |
|||
"qualityQualifiedNum": item.qualityQualifiedNum, |
|||
"qualityUnqualifiedNum": item.qualityUnqualifiedNum, |
|||
"makeTotal":item.makeTotal, |
|||
"materialDeptType": item.materialDeptType, |
|||
"makeCompletionNum":item.makeCompletionNum |
|||
// ...其他字段 |
|||
}; |
|||
}); |
|||
|
|||
const combinedData = Object.assign({}, qualityOrderData, { |
|||
qualityOrderDetailList: materialDataList, |
|||
}); |
|||
// 合并表单数据和表格数据 |
|||
console.log(combinedData) |
|||
// 使用 JSON.stringify() 序列化数据 |
|||
const jsonData = JSON.stringify(combinedData); |
|||
// 发送 AJAX 请求到后端接口 |
|||
$.operate.saveJson(prefix + "/makeStartingQuality", jsonData); |
|||
} |
|||
|
|||
//物料信息展示列表 |
|||
$(function() { |
|||
var options = { |
|||
modalName: "选择物料", |
|||
url: prefix + "/getMaterialListByQualityOrderCode", |
|||
queryParams: queryParams, |
|||
showSearch: false, |
|||
showRefresh: false, |
|||
showToggle: false, |
|||
showColumns: false, |
|||
pagination: false, // 设置不分页 |
|||
columns: [{ |
|||
checkbox: true |
|||
}, |
|||
{ |
|||
title: '品质单详情ID', |
|||
field: 'qualityOrderDetailId', |
|||
visible: false |
|||
}, |
|||
{ |
|||
title: '料号', |
|||
field: 'materialNo' |
|||
}, |
|||
{ |
|||
title: '物料名称', |
|||
field: 'materialName' |
|||
}, |
|||
{ |
|||
title: '物料类型', |
|||
field: 'materialType', |
|||
}, |
|||
{ |
|||
title: '物料图片地址', |
|||
field: 'materialPhotourl', |
|||
}, |
|||
{ |
|||
title: '物料描述', |
|||
field: 'materialDescribe', |
|||
}, |
|||
{ |
|||
title: '物料品牌', |
|||
field: 'materialBrand', |
|||
}, |
|||
{ |
|||
title: '物料单位', |
|||
field: 'materialUnit', |
|||
}, |
|||
{ |
|||
title: '物料加工方式', |
|||
field: 'materialProcessMethod', |
|||
}, |
|||
{ |
|||
title: '生产订单数', |
|||
field: 'makeTotal', |
|||
}, |
|||
{ |
|||
title: '品质已合格数', |
|||
field: 'qualityHasqualifiedNum', |
|||
}, |
|||
{ |
|||
title: '本次到货数', |
|||
field: 'thisArrivedNum', |
|||
editable:{ |
|||
type:'text', |
|||
validate: function (v) { |
|||
if (!v) return '本次到货数不能为空'; |
|||
} |
|||
}, |
|||
required:true |
|||
}, |
|||
{ |
|||
title: '品质报告', |
|||
align: 'center', |
|||
formatter: function(value, row, index) { |
|||
// 这里直接使用row对象获取supplierCode，假设它是存在的 |
|||
var actions = []; |
|||
actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="makeOrderReport(\'' + row.materialNo + '\')"><i class="fa fa-plus"></i>报告</a> '); |
|||
return actions.join(''); |
|||
} |
|||
}, |
|||
{ |
|||
title: '品质合格数', |
|||
field: 'qualityQualifiedNum', |
|||
}, |
|||
{ |
|||
title: '品质不合格数', |
|||
field: 'qualityUnqualifiedNum', |
|||
}, |
|||
{ |
|||
title: '生产完成数', |
|||
field: 'makeCompletionNum', |
|||
visible: false |
|||
}, |
|||
{ |
|||
title: '物料入库部门', |
|||
field: 'materialDeptType', |
|||
visible: false |
|||
} |
|||
] |
|||
}; |
|||
$.table.init(options); |
|||
}) |
|||
|
|||
function queryParams(params) { |
|||
var curParams = { |
|||
// 传递参数查询参数 |
|||
qualityOrderCode: qualityOrderCode |
|||
}; |
|||
console.log(curParams); |
|||
return curParams; |
|||
} |
|||
|
|||
function makeOrderReport(materialNo) { |
|||
var qualityOrderCode = [[${qualityOrder.qualityOrderCode}]]; |
|||
var queryParams = new URLSearchParams(); |
|||
queryParams.append('materialNo', materialNo); |
|||
queryParams.append('qualityOrderCode',encodeURIComponent(qualityOrderCode)); |
|||
|
|||
var url = ctx + 'quality/qualityOrder/makeOrderReport?' + queryParams.toString(); |
|||
$.modal.open("品质报告", url); |
|||
} |
|||
|
|||
</script> |
|||
</body> |
|||
</html> |
|||
Loading…
Reference in new issue