diff --git a/src/main/resources/static/js/basis/standard/child/testForm.js b/src/main/resources/static/js/basis/standard/child/testForm.js
index 012c4aa..3912386 100644
--- a/src/main/resources/static/js/basis/standard/child/testForm.js
+++ b/src/main/resources/static/js/basis/standard/child/testForm.js
@@ -339,6 +339,7 @@ function saveData(data) {
//试验依据列表
var yjList = convertToYjList(data.field);
var experDevList = convertToExperDevList(data.field);
+ console.log(experDevList)
//主要设备
var mainDevList = [{
@@ -465,6 +466,7 @@ function convertToExperDevList(originalData){
deviceIds.forEach(deviceId => {
// 使用deviceId来构建键名
const devIdKey = `devId-${deviceId}`;
+ const departmentIdKey = `departmentId-${deviceId}`;
const devCodeKey = `devCode-${deviceId}`;
const manufacturerKey = `manufacturer-${deviceId}`;
const manufactureDateKey = `manufactureDate-${deviceId}`;
@@ -480,6 +482,7 @@ function convertToExperDevList(originalData){
// 创建设备信息对象
const deviceItem = {
devId: originalData[devIdKey],
+ departmentId: originalData[departmentIdKey],
devCode: originalData[devCodeKey],
manufacturer: originalData[manufacturerKey],
manufactureDate: originalData[manufactureDateKey],
@@ -683,9 +686,10 @@ function generateHeaders(data) {
firstLevelHeader.colSpan = item.itemList.length;
firstLevelHeader.classList.add('center-aligned');
// firstLevelHeader.textContent = `${item.experTypeName} - ${item.amount}`;
- firstLevelHeader.innerHTML=`
-
-
+ firstLevelHeader.innerHTML=`
+ ${item.experTypeName} - ${item.amount}
+
+
`;
thead.rows[0].appendChild(firstLevelHeader);
@@ -693,9 +697,9 @@ function generateHeaders(data) {
item.itemList.forEach(subItem => {
const secondLevelHeader = document.createElement('th');
secondLevelHeader.classList.add('center-aligned');
- secondLevelHeader.innerHTML=`
-
-
+ secondLevelHeader.innerHTML=`
+ ${subItem.itemName}
+
`
// secondLevelHeader.textContent = subItem.itemName;
secondRow.appendChild(secondLevelHeader);
@@ -723,14 +727,15 @@ function generateRows(data,sampleDeviceVos){
const row = document.createElement('tr');
row.innerHTML = `
+
${idCounter} |
|
- |
+ |
|
- |
- |
- |
- |
+ |
+ |
+ |
+ |
`;
// 遍历itemList的长度，而不是itemList本身，以匹配表头的列数
for (let i = 0; i < columns; i++) {
@@ -741,6 +746,7 @@ function generateRows(data,sampleDeviceVos){
input.id = `devData-${idCounter}-${i + 1}`;
input.name = `devData-${idCounter}-${i + 1}`;
input.classList.add('layui-input');
+ input.maxLength='30';
input.setAttribute('lay-verify', 'required');
td.appendChild(input);
row.appendChild(td);
diff --git a/src/main/resources/static/js/basis/standard/child/testList.js b/src/main/resources/static/js/basis/standard/child/testList.js
index 3c05c0a..afc570b 100644
--- a/src/main/resources/static/js/basis/standard/child/testList.js
+++ b/src/main/resources/static/js/basis/standard/child/testList.js
@@ -77,23 +77,26 @@ function initTable(dataList, limit, page) {
templet: function (d) {
var testResult="";
var html = '';
- for (let i = 0; i < d.sampleList.length; i++) {
- if (d.sampleList[i].testResult == "合格") {
+ var sampleList = JSON.stringify(d.sampleList);
+ if(d.sampleList.length>0){
+ for (let i = 0; i < d.sampleList.length; i++) {
+ if (d.sampleList[i].testResult == "合格") {
- }else{
- testResult = d.sampleList[i].testResult
+ }else{
+ testResult = d.sampleList[i].testResult
+ }
}
+ // sampleList = JSON.stringify(d.sampleList);
}
+
if(testResult=="不合格"){
// 添加包裹元素并应用类
- html += "" +
- "" + // 注意这里是字符串形式
+ html += "" +
d.sampleQuantity +
"";
}else{
// 添加包裹元素并应用类
- html += "" +
- "" + // 注意这里是字符串形式
+ html += "" +
d.sampleQuantity +
"";
@@ -137,9 +140,12 @@ function initTable(dataList, limit, page) {
{title: "原始记录", unresize: true, width: 300, align: "center",
templet: function (d) {
var html = '';
- let search="查看";
+ let search ="";
+ if(d.status != "待试验"){
+ search="";
+ }
if (d.status == "待试验" || d.status == "待提交" || d.status == "审阅不通过" || d.status == "审核不通过" || d.status == "审批不通过") {
- let edit="编制";
+ let edit="";
html=search+edit;
} else {
html=search;
@@ -158,6 +164,52 @@ function initTable(dataList, limit, page) {
});
}
+var devOpenIndex='';
+function getMouseover(data){
+ // console.log(data)
+ // openIframeTable(data)
+ var html = '' +
+ '' +
+ '' +
+ '| 序号 | ' +
+ '设备编号 | ' +
+ '试验结果 | '+
+ '
'+
+ ''
+
+ html += '';
+ if (data.length>0){
+ for (let i = 0; i < data.length; i++){
+ html += '' +
+ '| ' + (i+1) + ' | ' +
+ '' + data[i].devCode + ' | ' +
+ '' + data[i].testResult + ' | ' +
+ '
';
+ }
+ }else{
+ html += '' +
+ '| 暂无数据 | ' +
+ '
';
+ }
+ html += '';
+ html += '
';
+
+ devOpenIndex = layer.open({
+ type: 0,
+ title: '设备信息',
+ area: ['300px', '300px'],
+ content: html,
+ btn: ['关闭'],
+ yes: function (index, layero) {
+ layer.close(index);
+ }
+ });
+}
+
+function getMouseout(){
+ // alert("鼠标移出");
+ // layer.close(devOpenIndex);
+}
// 获取参数
function getReqParams(page, limit, type) {
diff --git a/src/main/resources/static/js/basis/standard/child/testUpdateForm.js b/src/main/resources/static/js/basis/standard/child/testUpdateForm.js
index 64b98cb..3446502 100644
--- a/src/main/resources/static/js/basis/standard/child/testUpdateForm.js
+++ b/src/main/resources/static/js/basis/standard/child/testUpdateForm.js
@@ -121,6 +121,7 @@ function setTableData(data){
const rowNumber = index + 1;
// 赋值
$(`#devId-${rowNumber}`).val(item.id);
+ $(`#departmentId-${rowNumber}`).val(item.departmentId);
$(`#devCode-${rowNumber}`).val(item.devCode);
$(`#manufacturer-${rowNumber}`).val(item.manufacturer);
$(`#manufactureDate-${rowNumber}`).val(item.manufactureDate);
diff --git a/src/main/resources/static/js/basis/standard/testManagementList.js b/src/main/resources/static/js/basis/standard/testManagementList.js
index 795b0e5..80a74d3 100644
--- a/src/main/resources/static/js/basis/standard/testManagementList.js
+++ b/src/main/resources/static/js/basis/standard/testManagementList.js
@@ -127,7 +127,7 @@ function initTable(dataList, limit, page) {
},*/
{title: "操作", unresize: true, width: 300, align: "center",
templet: function (d) {
- return '试验';
+ return '';
}
},
],
@@ -242,6 +242,7 @@ function query() {
}
function reloadData() {
+ temp_all_list.splice(0,temp_all_list.length)
pages(pageNum, limitSize);
}
diff --git a/src/main/resources/static/js/basis/tools/child/addTestStandards.js b/src/main/resources/static/js/basis/tools/child/addTestStandards.js
index 2f7f902..c8a36c9 100644
--- a/src/main/resources/static/js/basis/tools/child/addTestStandards.js
+++ b/src/main/resources/static/js/basis/tools/child/addTestStandards.js
@@ -51,6 +51,39 @@ function setParams(params) {
saveData(data);
});
+ var ins = selectInput.getInstance("#experDevName");
+ // 监听select 选择事件
+ ins.on('itemSelect(experDevName)', function(obj) {
+ var devId=JSON.stringify(ins.getValue().value).replace(/"/g, '');
+ getEcho(devId);
+ });
+
+ });
+}
+
+//下拉选回显
+function getEcho(devId){
+ let url = dataUrl + '/sys/select/getDevices';
+ let obj = {
+ 'id':devId
+ }
+ let params = {
+ encryptedData: encryptCBC(JSON.stringify(obj))
+ }
+ ajaxRequest(url, "POST", params, false, function () {
+ }, function (result) {
+ if (result.code === 200) {
+ console.log(result.data)
+ if(result.data.length>0){
+ $('#experDevModule').val(result.data[0].devModule);
+ $('#experDevCode').val(result.data[0].devCode);
+ $('#devContractDate').val(result.data[0].contractDate);
+ }
+ } else {
+ layer.alert(result.msg, {icon: 2})
+ }
+ }, function (xhr) {
+ error(xhr)
});
}
diff --git a/src/main/resources/static/pages/basic/standard/child/testForm.html b/src/main/resources/static/pages/basic/standard/child/testForm.html
index c76c3e2..b1c2c86 100644
--- a/src/main/resources/static/pages/basic/standard/child/testForm.html
+++ b/src/main/resources/static/pages/basic/standard/child/testForm.html
@@ -201,18 +201,18 @@
- | 编号 |
- 客户自编号 |
- 样品信息 |
- 外观状态 |
- 金额 |
- 备注 |
+ 编号 |
+ 客户自编号 |
+ 样品信息 |
+ 外观状态 |
+ 金额 |
+ 备注 |
- | 生产厂家 |
- 生产日期 |
- 规格型号 |
+ 生产厂家 |
+ 生产日期 |
+ 规格型号 |