试验管理
This commit is contained in:
parent
58a05554df
commit
291c86324e
|
|
@ -26,12 +26,16 @@ function setParams(params) {
|
||||||
selectInput = layui.selectInput;
|
selectInput = layui.selectInput;
|
||||||
table = layui.table;
|
table = layui.table;
|
||||||
|
|
||||||
|
// 获取当前日期并格式化为 yyyy-MM-dd
|
||||||
|
const today = new Date().toISOString().substring(0, 10);
|
||||||
|
console.log(today);
|
||||||
laydate.render({
|
laydate.render({
|
||||||
elem: '#sampleDate'
|
elem: '#sampleDate'
|
||||||
});
|
});
|
||||||
|
|
||||||
laydate.render({
|
laydate.render({
|
||||||
elem: '#experTime'
|
elem: '#experTime',
|
||||||
|
value: today
|
||||||
});
|
});
|
||||||
|
|
||||||
laydate.render({
|
laydate.render({
|
||||||
|
|
@ -380,7 +384,7 @@ function saveData(data) {
|
||||||
'id': data.field["id"],
|
'id': data.field["id"],
|
||||||
'devTypeCode': value,
|
'devTypeCode': value,
|
||||||
'devTypeName': text,
|
'devTypeName': text,
|
||||||
'devModule': data.field["experDevModule"],
|
'devModule': data.field["devModule"],
|
||||||
'experLocalCode':'',
|
'experLocalCode':'',
|
||||||
'experLocal': data.field["experLocal"],
|
'experLocal': data.field["experLocal"],
|
||||||
'sampleId': data.field["sampleId"],
|
'sampleId': data.field["sampleId"],
|
||||||
|
|
@ -667,7 +671,7 @@ function setFormData(data) {
|
||||||
$('#sampleDate').val(data.sampleDate);
|
$('#sampleDate').val(data.sampleDate);
|
||||||
|
|
||||||
//试验日期
|
//试验日期
|
||||||
$('#experTime').val(data.experTime);
|
// $('#experTime').val(data.experTime);
|
||||||
|
|
||||||
//下次试验日期
|
//下次试验日期
|
||||||
$('#nextExperTime').val(data.nextExperTime);
|
$('#nextExperTime').val(data.nextExperTime);
|
||||||
|
|
@ -798,15 +802,15 @@ function generateRows(data,sampleDeviceVos){
|
||||||
<td class="table-cell-wide"><input style="border: 0px !important;" id="devCode-${idCounter}" readonly class="layui-input" name="devCode-${idCounter}" value="${sampleDeviceVos[i].devCode}" /></td>
|
<td class="table-cell-wide"><input style="border: 0px !important;" id="devCode-${idCounter}" readonly class="layui-input" name="devCode-${idCounter}" value="${sampleDeviceVos[i].devCode}" /></td>
|
||||||
<td class="table-cell-wide"><input maxlength="30" id="manufacturer-${idCounter}" lay-verify="required" class="layui-input" name="manufacturer-${idCounter}" /></td>
|
<td class="table-cell-wide"><input maxlength="30" id="manufacturer-${idCounter}" lay-verify="required" class="layui-input" name="manufacturer-${idCounter}" /></td>
|
||||||
<td class="table-cell-wide"><input id="manufactureDate-${idCounter}" lay-verify="required" class="layui-input" name="manufactureDate-${idCounter}" readonly /></td>
|
<td class="table-cell-wide"><input id="manufactureDate-${idCounter}" lay-verify="required" class="layui-input" name="manufactureDate-${idCounter}" readonly /></td>
|
||||||
<td class="table-cell-wide"><input maxlength="30" id="devModule-${idCounter}" lay-verify="required" class="layui-input" name="devModule-${idCounter}" /></td>
|
<td class="table-cell-wide"><input maxlength="30" id="devModule-${idCounter}" lay-verify="required" class="layui-input" name="devModule-${idCounter}" value="${sampleDeviceVos[i].devModule}" readonly /></td>
|
||||||
<td class="table-cell-wide"><input maxlength="30" id="devStatus-${idCounter}" lay-verify="required" class="layui-input" name="devStatus-${idCounter}" /></td>
|
<td class="table-cell-wide"><input maxlength="30" id="devStatus-${idCounter}" lay-verify="required" class="layui-input" name="devStatus-${idCounter}" /></td>
|
||||||
<td class="table-cell-wide"><input maxlength="6" id="amounts-${idCounter}" type="text" lay-affix="number" oninput="this.value = this.value.replace(/[^0-9.]/g, '').replace(/(\\..*)\\./g, '$1')" min="0" value="0.00" lay-verify="required" class="layui-input" name="amounts-${idCounter}" /></td>
|
<td class="table-cell-wide"><input maxlength="10" id="amounts-${idCounter}" type="text" lay-affix="number" oninput="this.value = this.value.replace(/[^0-9.]/g, '').replace(/(\\..*)\\./g, '$1')" min="0" value="0.00" lay-verify="required" class="layui-input" name="amounts-${idCounter}" /></td>
|
||||||
<td class="table-cell-wide"><input maxlength="60" id="remarks-${idCounter}" lay-verify="required" class="layui-input" name="remarks-${idCounter}" /></td>
|
<td class="table-cell-wide"><input maxlength="60" id="remarks-${idCounter}" lay-verify="required" class="layui-input" name="remarks-${idCounter}" /></td>
|
||||||
`;
|
`;
|
||||||
// 遍历itemList的长度,而不是itemList本身,以匹配表头的列数
|
// 遍历itemList的长度,而不是itemList本身,以匹配表头的列数
|
||||||
for (let i = 0; i < columns; i++) {
|
for (let i = 0; i < columns; i++) {
|
||||||
const td = document.createElement('td');
|
const td = document.createElement('td');
|
||||||
td.style.width = '340px';
|
td.style.width = '200vw';
|
||||||
const input = document.createElement('input');
|
const input = document.createElement('input');
|
||||||
input.type = 'text';
|
input.type = 'text';
|
||||||
input.id = `devData-${idCounter}-${i + 1}`;
|
input.id = `devData-${idCounter}-${i + 1}`;
|
||||||
|
|
|
||||||
|
|
@ -3,9 +3,9 @@
|
||||||
<head>
|
<head>
|
||||||
<meta charset="UTF-8">
|
<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/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">
|
<link rel="stylesheet" href="../../../../css/dataForm.css">
|
||||||
|
<link rel="stylesheet" href="../../../../css/font.css">
|
||||||
|
<link rel="stylesheet" href="../../../../css/basis/originalRecord.css">
|
||||||
<script src="../../../../js/libs/jquery-2.1.1.min.js" charset="UTF-8" type="text/javascript"></script>
|
<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/layui-v2.6.8/layui.js" charset="UTF-8" type="text/javascript"></script>
|
||||||
<script src="../../../../js/publicJs.js"></script>
|
<script src="../../../../js/publicJs.js"></script>
|
||||||
|
|
@ -41,7 +41,11 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
.table-cell-wide {
|
.table-cell-wide {
|
||||||
width: 340px !important;
|
width: 200vw !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.layui-table th, .layui-table td {
|
||||||
|
white-space: nowrap;
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
</head>
|
</head>
|
||||||
|
|
@ -63,7 +67,7 @@
|
||||||
<!--<select id="devCode" disabled lay-verify="required" name="devCode" style="background-color: #f0f0f0 !important;" class="form-control input-sm">
|
<!--<select id="devCode" disabled lay-verify="required" name="devCode" style="background-color: #f0f0f0 !important;" class="form-control input-sm">
|
||||||
</select>-->
|
</select>-->
|
||||||
<input type="hidden" id="devTypeCode" name="devTypeCode">
|
<input type="hidden" id="devTypeCode" name="devTypeCode">
|
||||||
<input type="text" id="devTypeName" name="devTypeName" lay-verify="required" style="background-color: #f0f0f0;" class="layui-input" placeholder="请输入设备规格" readonly />
|
<input type="text" id="devTypeName" name="devTypeName" lay-verify="required" style="background-color: #f0f0f0;" class="layui-input" readonly />
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
@ -161,29 +165,9 @@
|
||||||
<input type="text" class="layui-input" lay-verify="required" id="devContractDate" name="devContractDate" placeholder="请选择日期">
|
<input type="text" class="layui-input" lay-verify="required" id="devContractDate" name="devContractDate" placeholder="请选择日期">
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="layui-inline">
|
|
||||||
<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>
|
</div>
|
||||||
|
|
||||||
<div class="layui-form-item">
|
|
||||||
<div class="layui-inline">
|
|
||||||
<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-inline">
|
|
||||||
<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>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="layui-form-item" style="margin-top: 2%;" >
|
<div class="layui-form-item" style="margin-top: 2%;" >
|
||||||
<div class="layui-inline basis">
|
<div class="layui-inline basis">
|
||||||
|
|
@ -222,6 +206,36 @@
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div class="layui-form-item">
|
||||||
|
<div class="layui-inline">
|
||||||
|
<label class="layui-form-label"><i style="padding: 0 10px;">*</i>试验标准</label>
|
||||||
|
<div class="layui-input-inline" >
|
||||||
|
<textarea maxlength="200" type="text" id="experStand" name="experStand" lay-verify="required" placeholder="请输入试验标准" class="layui-textarea"></textarea>
|
||||||
|
<!-- <input type="text" id="experStand" name="experStand" lay-verify="required" class="layui-input" placeholder="请输入试验标准" />-->
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
<div class="layui-form-item">
|
||||||
|
<div class="layui-inline">
|
||||||
|
<label class="layui-form-label"><i style="padding: 0 10px;">*</i>试验结论</label>
|
||||||
|
<div class="layui-input-inline" >
|
||||||
|
<textarea maxlength="200" type="text" id="experConclu" name="experConclu" lay-verify="required" placeholder="请输入试验结论" class="layui-textarea"></textarea>
|
||||||
|
<!-- <input type="text" id="experConclu" name="experConclu" lay-verify="required" class="layui-input" placeholder="请输入试验结论" />-->
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="layui-form-item">
|
||||||
|
<div class="layui-inline">
|
||||||
|
<label class="layui-form-label"><i style="padding: 0 10px;">*</i>备注</label>
|
||||||
|
<div class="layui-input-inline" >
|
||||||
|
<textarea maxlength="200" type="text" id="remarsk" name="remarsk" lay-verify="required" placeholder="请输入备注" class="layui-textarea"></textarea>
|
||||||
|
<!-- <input type="text" id="remarsk" name="remarsk" lay-verify="required" class="layui-input" placeholder="请输入备注" />-->
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
<button type="submit" id="formSubmit" class="layui-btn" lay-submit="" lay-filter="formData"
|
<button type="submit" id="formSubmit" class="layui-btn" lay-submit="" lay-filter="formData"
|
||||||
style="display: none;"></button>
|
style="display: none;"></button>
|
||||||
</form>
|
</form>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue