Browse Source
品质管理 品质单 新增来料品质单页面采购品质、委外品质按钮跳转方法； 修改来料品质开始品质页面和详情页面，调整显示结构及功能； 修改其他生产开始品质页面交检时间输入框为只读； 新增采购入库品质审批页面；dev
10 changed files with 586 additions and 653 deletions
@ -1,255 +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-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, |
|
||||
"makeInNum":item.makeInNum, |
|
||||
"makeInUnitPrice": item.makeInUnitPrice, |
|
||||
"materialDeptType": item.materialDeptType, |
|
||||
// ...其他字段 |
|
||||
}; |
|
||||
}); |
|
||||
|
|
||||
const combinedData = Object.assign({}, qualityOrderData, { |
|
||||
qualityOrderDetailList: materialDataList, |
|
||||
}); |
|
||||
// 合并表单数据和表格数据 |
|
||||
console.log(combinedData) |
|
||||
// 使用 JSON.stringify() 序列化数据 |
|
||||
const jsonData = JSON.stringify(combinedData); |
|
||||
// 发送 AJAX 请求到后端接口 |
|
||||
$.operate.saveJson(prefix + "/makeInStartingQuality", 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: 'makeInNum', |
|
||||
}, |
|
||||
{ |
|
||||
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="makeInOrderReport(\'' + row.materialNo + '\')"><i class="fa fa-plus"></i>报告</a> '); |
|
||||
return actions.join(''); |
|
||||
} |
|
||||
}, |
|
||||
{ |
|
||||
title: '品质合格数', |
|
||||
field: 'qualityQualifiedNum', |
|
||||
}, |
|
||||
{ |
|
||||
title: '品质不合格数', |
|
||||
field: 'qualityUnqualifiedNum', |
|
||||
}, |
|
||||
{ |
|
||||
title: '委内加工费单价', |
|
||||
field: 'makeInUnitPrice', |
|
||||
visible: false |
|
||||
}, |
|
||||
{ |
|
||||
title: '物料入库部门', |
|
||||
field: 'materialDeptType', |
|
||||
visible: false |
|
||||
} |
|
||||
] |
|
||||
}; |
|
||||
$.table.init(options); |
|
||||
}) |
|
||||
|
|
||||
function queryParams(params) { |
|
||||
var curParams = { |
|
||||
// 传递参数查询参数 |
|
||||
qualityOrderCode: qualityOrderCode |
|
||||
}; |
|
||||
console.log(curParams); |
|
||||
return curParams; |
|
||||
} |
|
||||
|
|
||||
function makeInOrderReport(materialNo) { |
|
||||
var qualityOrderCode = [[${qualityOrder.qualityOrderCode}]]; |
|
||||
var queryParams = new URLSearchParams(); |
|
||||
queryParams.append('materialNo', materialNo); |
|
||||
queryParams.append('qualityOrderCode',encodeURIComponent(qualityOrderCode)); |
|
||||
|
|
||||
var url = ctx + 'quality/qualityOrder/makeInOrderReport?' + queryParams.toString(); |
|
||||
$.modal.open("品质报告", url); |
|
||||
} |
|
||||
|
|
||||
</script> |
|
||||
</body> |
|
||||
</html> |
|
||||
@ -1,207 +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-makeInStartingQualityDetail-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" disabled> |
|
||||
</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" disabled> |
|
||||
</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" disabled> |
|
||||
</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')}" disabled> |
|
||||
<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')}" disabled> |
|
||||
<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" disabled> |
|
||||
<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-makeInStartingQualityDetail-edit").validate({ |
|
||||
focusCleanup: true |
|
||||
}); |
|
||||
|
|
||||
$("input[name='deliveryInspectionTime']").datetimepicker({ |
|
||||
format: "yyyy-mm-dd", |
|
||||
minView: "month", |
|
||||
autoclose: true |
|
||||
}); |
|
||||
|
|
||||
|
|
||||
|
|
||||
// 新增提交 |
|
||||
function submitHandler() { |
|
||||
// 获取表单数据 |
|
||||
const qualityOrderData = $("#form-makeInStartingQualityDetail-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, |
|
||||
"thisArrivedNum": item.thisArrivedNum, |
|
||||
"qualityQualifiedNum": item.qualityQualifiedNum, |
|
||||
"qualityUnqualifiedNum": item.qualityUnqualifiedNum |
|
||||
// ...其他字段 |
|
||||
}; |
|
||||
}); |
|
||||
|
|
||||
const combinedData = Object.assign({}, qualityOrderData, { |
|
||||
qualityOrderDetailList: materialDataList, |
|
||||
}); |
|
||||
// 合并表单数据和表格数据 |
|
||||
console.log(combinedData) |
|
||||
// 使用 JSON.stringify() 序列化数据 |
|
||||
const jsonData = JSON.stringify(combinedData); |
|
||||
// 发送 AJAX 请求到后端接口 |
|
||||
$.operate.saveJson(prefix + "/makeInStartingQualityDetail", 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: 'makeInNum', |
|
||||
}, |
|
||||
{ |
|
||||
title: '品质已合格数', |
|
||||
field: 'qualityHasqualifiedNum', |
|
||||
}, |
|
||||
{ |
|
||||
title: '本次到货数', |
|
||||
field: 'thisArrivedNum', |
|
||||
}, |
|
||||
{ |
|
||||
title: '品质合格数', |
|
||||
field: 'qualityQualifiedNum', |
|
||||
}, |
|
||||
{ |
|
||||
title: '品质不合格数', |
|
||||
field: 'qualityUnqualifiedNum', |
|
||||
}] |
|
||||
}; |
|
||||
$.table.init(options); |
|
||||
}) |
|
||||
|
|
||||
function queryParams(params) { |
|
||||
var curParams = { |
|
||||
// 传递参数查询参数 |
|
||||
qualityOrderCode: qualityOrderCode |
|
||||
}; |
|
||||
console.log(curParams); |
|
||||
return curParams; |
|
||||
} |
|
||||
|
|
||||
|
|
||||
</script> |
|
||||
</body> |
|
||||
</html> |
|
||||
@ -0,0 +1,421 @@ |
|||||
|
<!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" /> |
||||
|
<th:block th:include="include :: bootstrap-editable-css" /> |
||||
|
</head> |
||||
|
<style> |
||||
|
.fixed-table-container { |
||||
|
border: 0px solid #ddd; |
||||
|
min-height: 80px; |
||||
|
} |
||||
|
.supplier-value { |
||||
|
display: flex; |
||||
|
align-items: center; |
||||
|
justify-content: space-between; |
||||
|
} |
||||
|
|
||||
|
.supplier-value span { |
||||
|
margin-right: 10px; |
||||
|
} |
||||
|
|
||||
|
.info-separator::after { |
||||
|
content: "-"; |
||||
|
margin: 0 5px; |
||||
|
} |
||||
|
</style> |
||||
|
<body class="white-bg"> |
||||
|
<div class="wrapper wrapper-content animated fadeInRight ibox-content"> |
||||
|
<form class="form-horizontal m" id="form-qualityOrderReport-pzjl" th:object="${formData}"> |
||||
|
<input name="qualityOrderReportId" th:field="*{qualityOrderReportId}" type="hidden"> |
||||
|
<input name="taskId" th:field="*{taskId}" type="hidden"> |
||||
|
<input name="taskName" th:field="*{taskName}" type="hidden"> |
||||
|
<input name="instanceId" th:field="*{instanceId}" type="hidden"> |
||||
|
<input name="instanceType" th:field="*{instanceType}" type="hidden"> |
||||
|
<input type="hidden" name="p_COM_comment" /> |
||||
|
<div class="form-group"> |
||||
|
<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-4 control-label">申请时间：</label> |
||||
|
<div class="col-sm-8"> |
||||
|
<div class="input-group date"> |
||||
|
<input name="applyTime" th:value="${#dates.format(formData.applyTime, '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-4 control-label">品质单号：</label> |
||||
|
<div class="col-sm-8"> |
||||
|
<input readonly name="qualityOrderCode" th:field="*{qualityOrderCode}" 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="inStorageCode" th:field="*{inStorageCode}" 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="relatedOrderCode" th:field="*{relatedOrderCode}" class="form-control" type="text"> |
||||
|
</div> |
||||
|
</div> |
||||
|
<div class="form-group"> |
||||
|
<label class="col-sm-4 control-label">品质单订单类型：</label> |
||||
|
<div class="col-sm-8"> |
||||
|
<select disabled id="qualityOrderType" 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-4 control-label">品质单入库类型：</label> |
||||
|
<div class="col-sm-8"> |
||||
|
<select disabled id="qualityStorageStatus" 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-4 control-label">交付质检时间：</label> |
||||
|
<div class="col-sm-8"> |
||||
|
<div class="input-group date"> |
||||
|
<input readonly name="deliveryInspectionTime" th:value="${#dates.format(formData.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> |
||||
|
|
||||
|
<div class="form-group"> |
||||
|
<label class="col-sm-4 control-label is-required" for="pzjlVerifyApproved">审批意见：</label> |
||||
|
<div class="col-sm-8"> |
||||
|
<select name="p_B_pzjlVerifyApproved" id="pzjlVerifyApproved" 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> |
||||
|
<!--物料信息--> |
||||
|
<div class="container" > |
||||
|
<div class="row"> |
||||
|
<div class="col-sm-12" id="tablesContainer"> |
||||
|
|
||||
|
</div> |
||||
|
</div> |
||||
|
</div> |
||||
|
|
||||
|
<div class="container"> |
||||
|
<h3 style="color: blue;">品质报告:</h3> |
||||
|
<div class="col-sm-12"> |
||||
|
<h3>合格数</h3> |
||||
|
<div class="row"> |
||||
|
<div class="form-group col-sm-6"> |
||||
|
<label class="col-sm-4 control-label is-required">ok允收数：</label> |
||||
|
<div class="col-sm-8"> |
||||
|
<input readonly id="okAcceptedNum" name="okAcceptedNum" class="form-control" th:field="*{okAcceptedNum}" type="number" value="0" required> |
||||
|
</div> |
||||
|
</div> |
||||
|
<div class="form-group col-sm-6"> |
||||
|
<label class="col-sm-4 control-label">ok报告图片：</label> |
||||
|
<div class="col-sm-8"> |
||||
|
<input readonly name="okReportUrl" class="form-control" type="text"> |
||||
|
</div> |
||||
|
</div> |
||||
|
</div> |
||||
|
<div class="row"> |
||||
|
<div class="form-group col-sm-6"> |
||||
|
<label class="col-sm-4 control-label is-required">特采/让步数：</label> |
||||
|
<div class="col-sm-8"> |
||||
|
<input readonly id="specialConcessionsNum" name="specialConcessionsNum" th:field="*{specialConcessionsNum}" class="form-control" type="number" value="0" required> |
||||
|
</div> |
||||
|
</div> |
||||
|
<div class="form-group col-sm-6"> |
||||
|
<label class="col-sm-4 control-label">特采报告图片：</label> |
||||
|
<div class="col-sm-8"> |
||||
|
<input readonly name="specialReportUrl" class="form-control" type="text"> |
||||
|
</div> |
||||
|
</div> |
||||
|
</div> |
||||
|
</div> |
||||
|
<!--不合格数--> |
||||
|
<div class="col-sm-12"> |
||||
|
<div class="row"> |
||||
|
<div class="col-sm-12 align-items-center"> |
||||
|
<span style="font-weight: bold; font-family: Arial, sans-serif; font-size: 15px;padding-left: 0px;">不良数</span> |
||||
|
<div class="row"> |
||||
|
<div class="form-group col-sm-6"> |
||||
|
<label class="col-sm-4 control-label is-required">不良数：</label> |
||||
|
<div class="col-sm-8"> |
||||
|
<input readonly id="processBadNum" name="processBadNum" th:field="*{processBadNum}" class="form-control" type="number" value="0" required> |
||||
|
</div> |
||||
|
</div> |
||||
|
<div class="form-group col-sm-6"> |
||||
|
<label class="col-sm-4 control-label">检验完成时间：</label> |
||||
|
<div class="col-sm-8"> |
||||
|
<div class="input-group date"> |
||||
|
<input readonly name="checkoutCompletionTime" class="form-control" th:value="${#dates.format(formData.checkoutCompletionTime, 'yyyy-MM-dd')}" placeholder="yyyy-MM-dd" type="text"> |
||||
|
<span class="input-group-addon"><i class="fa fa-calendar"></i></span> |
||||
|
</div> |
||||
|
</div> |
||||
|
</div> |
||||
|
</div> |
||||
|
|
||||
|
</div> |
||||
|
</div> |
||||
|
<div class="container" id="shippingDevice"> |
||||
|
|
||||
|
</div> |
||||
|
|
||||
|
|
||||
|
</div> |
||||
|
</div> |
||||
|
|
||||
|
<!--其他字段--> |
||||
|
|
||||
|
<div class="form-group" style="margin-top: 20px;"> |
||||
|
<label class="col-sm-4 control-label">备注：</label> |
||||
|
<div class="col-sm-8"> |
||||
|
<textarea readonly th:text="*{remark}" name="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:src="@{/js/activiti.js}"></script> |
||||
|
<script th:inline="javascript"> |
||||
|
|
||||
|
var qualityOrderReport = [[${formData}]]; |
||||
|
var qualityDetail = [[${qualityDetail}]]; |
||||
|
var qualityOrderCode = qualityOrderReport.qualityOrderCode; |
||||
|
var processMethodDatas = [[${@dict.getType('processMethod')}]]; |
||||
|
var materialTypeDatas = [[${@category.getChildByCode('materialType')}]]; |
||||
|
var processBadClassificationDatas = [[${@dict.getType('process_bad_classification')}]]; |
||||
|
var processBadGradeDatas = [[${@dict.getType('process_bad_grade')}]]; |
||||
|
var tableIndex = 0; |
||||
|
|
||||
|
var prefix = ctx + "quality/qualityReport"; |
||||
|
var orderPrefix = ctx + "quality/qualityOrder"; |
||||
|
$("#form-qualityOrderReport-pzjl").validate({ |
||||
|
focusCleanup: true |
||||
|
}); |
||||
|
|
||||
|
$("input[name='deliveryInspectionTime']").datetimepicker({ |
||||
|
format: "yyyy-mm-dd", |
||||
|
minView: "month", |
||||
|
autoclose: true |
||||
|
}); |
||||
|
|
||||
|
//物料信息展示列表 |
||||
|
$(function() { |
||||
|
var supplierData = { |
||||
|
supplierCode: qualityDetail.supplierCode, |
||||
|
supplierName: qualityDetail.supplierName, |
||||
|
customerContact: qualityDetail.customerContact, |
||||
|
contactNumber: qualityDetail.contactNumber, |
||||
|
supplierAddress: qualityDetail.supplierAddress, |
||||
|
} |
||||
|
var materialData = []; |
||||
|
materialData.push(qualityDetail); |
||||
|
var $tableWrapper = $('<div class="table-responsive mt-3"></div>'); |
||||
|
|
||||
|
// 构建含有额外供应商信息的标题字符串 |
||||
|
var headerTitle ='供应商'+'</br>' + supplierData.supplierCode + ' - ' + (supplierData.supplierName || 'N/A') + |
||||
|
' </br> ' + (supplierData.customerContact || 'N/A') + |
||||
|
' - ' + (supplierData.contactNumber || 'N/A') + |
||||
|
' - ' + (supplierData.supplierAddress || 'N/A'); |
||||
|
var $header = $('<h4>' + headerTitle + '</h4>'); |
||||
|
|
||||
|
var $table = $('<table id="bootstrap-material-table" class="table table-striped"></table>'); |
||||
|
|
||||
|
|
||||
|
$table.bootstrapTable({ |
||||
|
data: materialData, |
||||
|
columns: [ |
||||
|
{ |
||||
|
title: '供应商ID', |
||||
|
field: 'supplierCode', |
||||
|
visible: false |
||||
|
}, |
||||
|
{ |
||||
|
title: '品质单详情ID', |
||||
|
field: 'qualityOrderDetailId', |
||||
|
visible: false |
||||
|
|
||||
|
}, |
||||
|
{ |
||||
|
title: '料号', |
||||
|
align: 'center', |
||||
|
field: 'materialNo', |
||||
|
|
||||
|
}, { |
||||
|
title: '物料名称', |
||||
|
field: 'materialName' |
||||
|
}, |
||||
|
{ |
||||
|
title: '物料类型', |
||||
|
field: 'materialType', |
||||
|
formatter: function(value, row, index) { |
||||
|
return $.table.selectCategoryLabel(materialTypeDatas, value); |
||||
|
} |
||||
|
}, |
||||
|
{ |
||||
|
title: '图片', |
||||
|
field: 'materialPhotourl', |
||||
|
}, |
||||
|
{ |
||||
|
title: '描述', |
||||
|
field: 'materialDescribe', |
||||
|
}, |
||||
|
{ |
||||
|
title: '品牌', |
||||
|
field: 'materialBrand', |
||||
|
}, |
||||
|
{ |
||||
|
title: '单位', |
||||
|
field: 'materialUnit', |
||||
|
}, |
||||
|
{ |
||||
|
title: '加工方式', |
||||
|
field: 'materialProcessMethod', |
||||
|
formatter: function(value, row, index) { |
||||
|
return $.table.selectDictLabel(processMethodDatas, value); |
||||
|
} |
||||
|
}, |
||||
|
{ |
||||
|
title: '检验数', |
||||
|
field: 'checkNum', |
||||
|
}, |
||||
|
|
||||
|
{ |
||||
|
title: '合格数', |
||||
|
field: 'qualityQualifiedNum', |
||||
|
}, |
||||
|
{ |
||||
|
title: '不良数', |
||||
|
field: 'qualityUnqualifiedNum', |
||||
|
}, |
||||
|
{ |
||||
|
title: '待审核数', |
||||
|
field: 'pendingReviewNum', |
||||
|
}, |
||||
|
] |
||||
|
}); |
||||
|
|
||||
|
$tableWrapper.append($header).append($table); |
||||
|
$('#tablesContainer').append($tableWrapper); |
||||
|
|
||||
|
//移除表格上方toolbar（去除空白） |
||||
|
$(".fixed-table-toolbar").remove(); |
||||
|
|
||||
|
initOtherUnqualifiedTable(); |
||||
|
}) |
||||
|
|
||||
|
function initOtherUnqualifiedTable(){ |
||||
|
var $unqualifiedTable = $( |
||||
|
'<div class="row">\n' + |
||||
|
' <span style="font-weight: bold; font-family: Arial, sans-serif; font-size: 15px;padding-left: 0px;">不良分类</span>\n' + |
||||
|
' <div id="unqualifiedTable" class="col-sm-12 table-striped">\n' + |
||||
|
' <table id="bootstrap-unqualified-table"></table>\n' + |
||||
|
' </div>\n' + |
||||
|
'</div>' |
||||
|
); |
||||
|
$("#shippingDevice").append($unqualifiedTable); |
||||
|
var unqualifiedOption = { |
||||
|
id: "bootstrap-unqualified-table", |
||||
|
modalName: "不良数", |
||||
|
url: prefix + "/getReportUnqualified", |
||||
|
showColumns: false, |
||||
|
pagination: false, |
||||
|
showToggle: false, |
||||
|
showRefresh:false, |
||||
|
showSearch:false, |
||||
|
height: 40, |
||||
|
queryParams: { |
||||
|
qualityOrderReportCode: qualityOrderReport.qualityOrderReportCode, |
||||
|
}, |
||||
|
columns: [ |
||||
|
{ |
||||
|
title: '品质报告单id', |
||||
|
field: 'qualityOrderReportId', |
||||
|
visible: false |
||||
|
}, |
||||
|
{ |
||||
|
title: '不良分类', |
||||
|
align: 'center', |
||||
|
field: 'processBadClassification', |
||||
|
formatter:function (value, row, index) { |
||||
|
return $.table.selectDictLabel(processBadClassificationDatas, value); |
||||
|
} |
||||
|
}, |
||||
|
{ |
||||
|
title: '不良等级', |
||||
|
align: 'center', |
||||
|
field: 'processBadGrade', |
||||
|
formatter:function (value, row, index) { |
||||
|
return $.table.selectDictLabel(processBadGradeDatas, value); |
||||
|
} |
||||
|
}, |
||||
|
{ |
||||
|
title: '数量', |
||||
|
field: 'processBadNum', |
||||
|
align: 'center', |
||||
|
|
||||
|
}, |
||||
|
{ |
||||
|
title: '报告', |
||||
|
align: 'center', |
||||
|
field: 'unqualifiedReportUrl', |
||||
|
}, |
||||
|
] |
||||
|
}; |
||||
|
$.table.init(unqualifiedOption); |
||||
|
$(".fixed-table-container","#unqualifiedTable").css("min-height","160px"); |
||||
|
|
||||
|
} |
||||
|
|
||||
|
function queryParams(params) { |
||||
|
var curParams = { |
||||
|
// 传递参数查询参数 |
||||
|
qualityOrderCode: qualityOrderCode |
||||
|
}; |
||||
|
return curParams; |
||||
|
} |
||||
|
$("input[name='checkoutCompletionTime']").datetimepicker({ |
||||
|
format: "yyyy-mm-dd", |
||||
|
minView: "month", |
||||
|
autoclose: true |
||||
|
}); |
||||
|
|
||||
|
function submitHandler() { |
||||
|
if ($.validate.form()) { |
||||
|
|
||||
|
if ($('textarea[name="comment"]').val()) { |
||||
|
$('input[name="p_COM_comment"]').val($('textarea[name="comment"]').val()); |
||||
|
} |
||||
|
var taskId = [[${taskId}]]; |
||||
|
$.operate.save(prefix + "/complete/" + taskId, $('#form-qualityOrderReport-pzjl').serialize()); |
||||
|
} |
||||
|
} |
||||
|
|
||||
|
|
||||
|
</script> |
||||
|
</body> |
||||
|
</html> |
||||
Loading…
Reference in new issue