haozq
/
ah_sz_gqj
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

试验管理

This commit is contained in:
lSun 2024-07-23 21:20:46 +08:00
parent f3dc6b7e08
commit 159afd7b08
6 changed files with 361 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/resources/static/js/basis/standard/child/testForm.js
View File

@ -394,9 +394,9 @@ function saveData(data) {
let url = dataUrl + "/experimental/addTestData";
let params = obj;
// if(params.id !=""){
// url = dataUrl + "/experimentStandard/editData";
// }
if(params.id !=""){
url = dataUrl + "/experimental/editTestData";
}
params={
encryptedData:encryptCBC(JSON.stringify(params))
}
@ -634,7 +634,6 @@ function setFormData(data) {
sampleQuantity = data.sampleDeviceVos.length;
for (let i = 1; i <= data.sampleDeviceVos.length; i++) {
var dateId = '#manufactureDate-'+i;
console.log(dateId)
laydate.render({
elem: dateId,
max:formatCurrentMonth()

13
src/main/resources/static/js/basis/standard/child/testList.js
View File

@ -78,7 +78,7 @@ function initTable(dataList, limit, page) {
{title: "原始记录", unresize: true, width: 300, align: "center",
templet: function (d) {
var html = '';
let search="<a class=\"layui-icon \" style='cursor:pointer;' title='查看' style=\"color: blue;\" onclick=\"checkData('" + d.sampleId + "','"+ d.devTypeCode+"')\">查看</a>";
let search="<a class=\"layui-icon \" style='cursor:pointer;' title='查看' style=\"color: blue;\" onclick=\"checkData('" + d.experId + "','" + d.sampleId + "','"+ d.devTypeCode+"')\">查看</a>";
if (d.status == "待试验" || d.status == "待提交" || d.status == "审阅不通过" || d.status == "审核不通过" || d.status == "审批不通过") {
let edit="<a class=\"layui-icon \" style='cursor:pointer;' title='编制' style=\"color: blue;\" onclick=\"addData('" + d.experId + "','" + d.sampleId + "','"+ d.devTypeCode+"')\">编制</a>";
html=search+edit;
@ -136,6 +136,17 @@ function reloadData() {
pages(pageNum, limitSize);
}
// 查看
function checkData(experId,sampleId,devTypeCode) {
let param = {
'experId': experId,
'sampleId': sampleId,
'devTypeCode':devTypeCode,
'customNum':customNumParam
}
openIframeMax("testCheck.html", "查看试验", "testCheck.html", '80%', '100%', param);
}
// 试验新增、修改
function addData(experId,sampleId,devTypeCode) {
let title = '新增试验'

135
src/main/resources/static/js/basis/standard/child/testUpdateForm.js Normal file
View File

@ -0,0 +1,135 @@
//修改前的传参
function getTestViewById(){
let loadingMsg = layer.msg("数据加载中,请稍候...", {icon: 16, scrollbar: false, time: 0,});
let url = dataUrl + "/experimental/viewTestData";
let params = {
id: experIdParam
}
params={
encryptedData:encryptCBC(JSON.stringify(params))
}
ajaxRequest(url, "POST", params, true, function () {
}, function (result) {
layer.close(loadingMsg); // 关闭提示层
if (result.code === 200) {
// console.log("试验form=" + result.data)
setFormUpadteData(result.data);
} else if (result.code === 500) {
layer.alert(result.msg, {icon: 2},function (index){
closePage(1);
})
}
}, function (xhr) {
layer.close(loadingMsg); // 关闭提示层
error(xhr)
});
}
function setFormUpadteData(data) {
if (data) {
console.log("修改",data)
$('#id').val(data.id);
$('#sampleId').val(data.sampleId);
$('#customId').val(data.customId);
//设备类别
// getDicts("dev_code",'devTypeName',data.devTypeName,"设备类别",30);
$('#devCode option[value=' + data.devTypeCode + ']').attr('selected', true);
//设备规格
$('#devModule').val(data.devModule);
//收样日期
$('#sampleDate').val(data.sampleDate);
//试验日期
$('#experTime').val(data.experTime);
//下次试验日期
$('#nextExperTime').val(data.nextExperTime);
//试验地点
getDicts("sy_local",'experLocal',data.experLocal,"试验地点",30);
//试验设备列表
/*for (let i = 0; i < data.deviceVos.length; i++) {
var k = i+1;
if(k>1){
devAdd()
}
getDevList("devName-"+k ,data.deviceVos[i].devName,"试验设备列表",30);
}*/
//设备名称
getDevList("experDevName" ,data.mainDeviceVos[0].experDevName,"设备名称",30);
//设备型号
$('#experDevModule').val(data.mainDeviceVos[0].experDevModule)
//设备编号
$('#experDevCode').val(data.mainDeviceVos[0].experDevCode)
//合同生效日期
$('#devContractDate').val(data.mainDeviceVos[0].devContractDate)
//试验依据
for (let i = 0; i < data.basisVos.length; i++) {
var k = i+1;
if(k>1){
basisAdd()
}
getDicts("sy_basis",'basisName-'+k,data.basisVos[i].basisName,"试验依据",30);
}
//试验项信息
//插入一级表头
generateHeaders(data.configItemsVos);
//插入单位格
generateRows(data.configItemsVos, data.experDevVos);
//生产日期
var sampleQuantity = 0;
if(data.experDevVos.length>0){
sampleQuantity = data.experDevVos.length;
for (let i = 1; i <= data.experDevVos.length; i++) {
var dateId = '#manufactureDate-'+i;
laydate.render({
elem: dateId,
max:formatCurrentMonth()
});
}
}
//进行表格赋值操作
setTableData(data.experDevVos);
//样品数量
$("#sampleQuantity").val(sampleQuantity);
//试验标准
$("#experStand").val(data.experStand);
//试验结论
$("#experConclu").val(data.experConclu);
//备注
$("#remarsk").val(data.remarsk);
layui.form.render();
}
}
function setTableData(data){
// 遍历数据
data.forEach((item, index) => {
// 计算index+1，因为你的ID从1开始
const rowNumber = index + 1;
// 赋值
$(`#devId-${rowNumber}`).val(item.id);
$(`#devCode-${rowNumber}`).val(item.devCode);
$(`#manufacturer-${rowNumber}`).val(item.manufacturer);
$(`#manufactureDate-${rowNumber}`).val(item.manufactureDate);
$(`#devModule-${rowNumber}`).val(item.devModule);
$(`#devStatus-${rowNumber}`).val(item.devStatus);
$(`#amount-${rowNumber}`).val(item.amount);
$(`#remarks-${rowNumber}`).val(item.remarks);
// devData 是一个字符串，需要解析为数组
const devDataArray = JSON.parse(item.devData);
for (let i = 0; i < devDataArray.length; i++) {
$(`#devData-${rowNumber}-${i + 1}`).val(devDataArray[i]);
}
});
}

4
src/main/resources/static/js/basis/tools/testStandardsList.js
View File

@ -130,7 +130,7 @@ function addData(id) {
let param = {
'id': id
}
openIframeMax("addOrEditTestStandards", title, "child/addTestStandards.html", '80%', '100%', param);
openIframeMax("addOrEditTestStandards", title, "child/addTestStandards.html", '1000px', '625px', param);
}
// 查看试验标准
@ -138,7 +138,7 @@ function checkData(id) {
let param = {
'id': id
}
openIframeMax("addOrEditTestStandards", "查看试验标准", "child/checkTestStandards.html", '80%', '80%', param);
openIframeMax("addOrEditTestStandards", "查看试验标准", "child/checkTestStandards.html", '1000px', '625px', param);
}
/*删除用户*/

208
src/main/resources/static/pages/basic/standard/child/testCheck.html Normal file
View File

@ -0,0 +1,208 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<link rel="stylesheet" href="../../../../js/layui-v2.6.8/css/layui.css" media="all">
<link rel="stylesheet" href="../../../../js/layui-v2.6.8/dtree/dtree.css">
<link rel="stylesheet" href="../../../../js/layui-v2.6.8/dtree/font/dtreefont.css">
<link rel="stylesheet" href="../../../../css/dataForm.css">
<script src="../../../../js/libs/jquery-2.1.1.min.js" charset="UTF-8" type="text/javascript"></script>
<script src="../../../../js/layui-v2.6.8/layui.js" charset="UTF-8" type="text/javascript"></script>
<script src="../../../../js/publicJs.js"></script>
<script src="../../../../js/select.js"></script>
<script src="../../../../js/dict.js"></script>
<script src="../../../../js/ajaxRequest.js"></script>
<script src="../../../../js/my/aes.js"></script>
<title>试验查看</title>
<style>
.switch{
line-height: 35px;
cursor:pointer;
}
.layui-input-dev{
display: flex;
border: 0px;
color: #595959 !important;
border: 1px solid #d9d9d9 !important;
height: 40px;
font-size: 16px;
background-color: transparent;
padding: 3px 6px;
letter-spacing: 1px;
}
.center-aligned {
text-align: center !important;
}
</style>
</head>
<body>
<div id="main-box">
<form class="layui-form" onsubmit="return false;">
<input hidden id="id" name="id">
<input hidden id="sampleId" name="sampleId">
<input hidden id="customId" name="customId">
<div class="layui-form-item" style="margin-top: 2%;">
<label class="layui-form-label"><i style="padding: 0 10px;">*</i>设备类别</label>
<div class="layui-input-inline" >
<select id="devCode" disabled lay-verify="required" name="devCode" style="background-color: #f0f0f0 !important;" class="form-control input-sm">
</select>
</div>
</div>
<div class="layui-form-item" style="margin-top: 2%;">
<label class="layui-form-label"><i style="padding: 0 10px;">*</i>设备规格</label>
<div class="layui-input-inline" >
<input type="text" id="devModule" name="devModule" lay-verify="required" style="background-color: #f0f0f0;" class="layui-input" placeholder="请输入设备规格"readonly />
</div>
</div>
<div class="layui-form-item" style="margin-top: 2%;">
<label class="layui-form-label"><i style="padding: 0 10px;">*</i>样品数量</label>
<div class="layui-input-inline" >
<input type="text" id="sampleQuantity" lay-affix="number" readonly min="0" style="background-color: #f0f0f0;" oninput="this.value=this.value.replace(/[^0-9]\d*/g,'')" name="sampleQuantity" lay-verify="required" class="layui-input" placeholder="请输入样品数量" />
</div>
</div>
<div class="layui-form-item" style="margin-top: 2%;">
<label class="layui-form-label"><i style="padding: 0 10px;">*</i>收样日期</label>
<div class="layui-input-inline" >
<input type="text" id="sampleDate" name="sampleDate" lay-verify="required" style="background-color: #f0f0f0;" class="layui-input" placeholder="请选择收样日期" readonly />
</div>
</div>
<div class="layui-form-item" style="margin-top: 2%;">
<label class="layui-form-label"><i style="padding: 0 10px;">*</i>试验日期</label>
<div class="layui-input-inline" >
<input type="text" id="experTime" name="experTime" lay-verify="required" class="layui-input" placeholder="请选择试验日期" readonly />
</div>
</div>
<div class="layui-form-item" style="margin-top: 2%;">
<label class="layui-form-label"><i style="padding: 0 10px;">*</i>下次试验日期</label>
<div class="layui-input-inline" >
<input type="text" id="nextExperTime" name="nextExperTime" lay-verify="required" class="layui-input" placeholder="请选择下次试验日期" readonly />
</div>
</div>
<div class="layui-form-item" style="margin-top: 2%;">
<label class="layui-form-label"><i style="padding: 0 10px;">*</i>试验地点</label>
<div class="layui-input-inline" id="experLocal">
</div>
</div>
<!--<div class="layui-form-item" style="margin-top: 2%;" >
<div class="layui-inline dev">
<label class="layui-form-label"><i style="padding: 0 10px;">*</i>试验设备列表</label>
<div class="layui-input-inline" id="devName-1">
</div>
</div>
<div class="btn-box">
<button class="layui-btn layui-btn-norma save" onclick="devAdd()">新增试验设备列表</button>
<button class="layui-btn layui-btn-primary cancel" onclick="devDel()">删除试验设备列表</button>
</div>
</div>-->
<div class="layui-form-item" style="margin-top: 2%;">
<label class="layui-form-label"><i style="padding: 0 10px;">*</i>设备名称</label>
<div class="layui-input-inline" id="experDevName">
</div>
</div>
<div class="layui-form-item" style="margin-top: 2%;">
<label class="layui-form-label"><i style="padding: 0 10px;">*</i>设备型号</label>
<div class="layui-input-inline" >
<input type="text" id="experDevModule" name="experDevModule" lay-verify="required" class="layui-input" placeholder="请输入设备型号" />
</div>
</div>
<div class="layui-form-item" style="margin-top: 2%;">
<label class="layui-form-label"><i style="padding: 0 10px;">*</i>设备编号</label>
<div class="layui-input-inline" >
<input type="text" id="experDevCode" name="experDevCode" lay-verify="required" class="layui-input" placeholder="请输入设备编号" />
</div>
</div>
<div class="layui-form-item" style="margin-top: 2%;">
<label class="layui-form-label"><i style="padding: 0 10px;">*</i>合同生效日期</label>
<div class="layui-input-inline">
<input type="text" class="layui-input" lay-verify="required" id="devContractDate" name="devContractDate" placeholder="请选择日期">
</div>
</div>
<div class="layui-form-item" style="margin-top: 2%;" >
<div class="layui-inline basis">
<label class="layui-form-label"><i style="padding: 0 10px;">*</i>试验依据</label>
<div class="layui-input-inline" id="basisName-1">
</div>
</div>
<!-- <div class="btn-box">-->
<!-- <button class="layui-btn layui-btn-norma save" onclick="basisAdd()">新增试验依据</button>-->
<!-- <button class="layui-btn layui-btn-primary cancel" onclick="basisDel()">删除试验依据</button>-->
<!-- </div>-->
</div>
<div class="layui-form-item" style="margin-top: 2%;overflow: auto;">
<table class="layui-table" id="dynamicTable" style="overflow: auto;">
<thead >
<tr>
<th rowspan="2" class="center-aligned">编号</th>
<th rowspan="2" class="center-aligned">客户自编号</th>
<th colspan="3" class="center-aligned">样品信息</th>
<th rowspan="2" class="center-aligned">外观状态</th>
<th rowspan="2" class="center-aligned">金额</th>
<th rowspan="2" class="center-aligned">备注</th>
</tr>
<tr>
<th class="center-aligned">生产厂家</th>
<th class="center-aligned">生产日期</th>
<th class="center-aligned">规格型号</th>
</tr>
</thead>
<tbody>
</tbody>
</table>
</div>
<div class="layui-form-item" style="margin-top: 2%;">
<label class="layui-form-label"><i style="padding: 0 10px;">*</i>试验标准</label>
<div class="layui-input-inline" >
<input type="text" id="experStand" name="experStand" lay-verify="required" class="layui-input" placeholder="请输入试验标准" />
</div>
</div>
<div class="layui-form-item" style="margin-top: 2%;">
<label class="layui-form-label"><i style="padding: 0 10px;">*</i>试验结论</label>
<div class="layui-input-inline" >
<input type="text" id="experConclu" name="experConclu" lay-verify="required" class="layui-input" placeholder="请输入试验结论" />
</div>
</div>
<div class="layui-form-item" style="margin-top: 2%;">
<label class="layui-form-label"><i style="padding: 0 10px;">*</i>备注</label>
<div class="layui-input-inline" >
<input type="text" id="remarsk" name="remarsk" lay-verify="required" class="layui-input" placeholder="请输入备注" />
</div>
</div>
<button type="submit" id="formSubmit" class="layui-btn" lay-submit="" lay-filter="formData"
style="display: none;"></button>
</form>
</div>
<div class="btn-box">
<!-- <button class="layui-btn layui-btn-norma save" onclick="saveData2()">确定</button>-->
<button class="layui-btn layui-btn-primary cancel" onclick="closePage()">取消</button>
</div>
</body>
<script src="../../../../js/basis/standard/child/testForm.js" charset="UTF-8" type="text/javascript"></script>
<script src="../../../../js/basis/standard/child/testUpdateForm.js" charset="UTF-8" type="text/javascript"></script>
<script src="../../../../js/basis/tools/child/select.js" charset="UTF-8" type="text/javascript"></script>
</html>

1
src/main/resources/static/pages/basic/standard/child/testForm.html
View File

@ -203,5 +203,6 @@
</div>
</body>
<script src="../../../../js/basis/standard/child/testForm.js" charset="UTF-8" type="text/javascript"></script>
<script src="../../../../js/basis/standard/child/testUpdateForm.js" charset="UTF-8" type="text/javascript"></script>
<script src="../../../../js/basis/tools/child/select.js" charset="UTF-8" type="text/javascript"></script>
</html>