diff --git a/src/main/resources/static/css/basis/viewOriginalRecord.css b/src/main/resources/static/css/basis/viewOriginalRecord.css index 935393d..85d24b4 100644 --- a/src/main/resources/static/css/basis/viewOriginalRecord.css +++ b/src/main/resources/static/css/basis/viewOriginalRecord.css @@ -40,14 +40,14 @@ body { width: 25%; } .classTable { - /*width: 100%;*/ + width: 100%; table-layout: fixed; text-align: center; border-collapse: collapse; border-spacing: 0; box-sizing: border-box; border: 1px solid #000; - /*height: calc(100% - 80px);*/ + overflow: auto; } .classTable tr td{ font-size: 16px; @@ -88,6 +88,15 @@ body { .w-400 { width: 400px; } + +.btn-box { + width: 100%; + height: 80px; + box-sizing: border-box; + display: flex; + justify-content: right; + align-items: center; +} /*滚动条样式start*/ ::-webkit-scrollbar { width: 10px; diff --git a/src/main/resources/static/js/primaryData/child/viewOriginalRecord.js b/src/main/resources/static/js/primaryData/child/viewOriginalRecord.js index e312412..920d1b1 100644 --- a/src/main/resources/static/js/primaryData/child/viewOriginalRecord.js +++ b/src/main/resources/static/js/primaryData/child/viewOriginalRecord.js @@ -39,7 +39,6 @@ function getDataById() { /**表单赋值*/ function setFormData(obj) { setTableInfo(obj); - console.log(obj) } /*赋值表格信息*/ @@ -53,7 +52,7 @@ function setTableInfo(obj) { firstHtml += '' + item.experTypeName + '' $.each(itemList, function (index2, item2) { num++; - colHtml += '' + colHtml += '' twoHtml += '' + item2.itemName + ''; }) }) @@ -97,6 +96,8 @@ function setTableInfo(obj) { $('#yj').html(yjList); $('#sampleUnit').html(obj.customName); $('#sampleDate').html(obj.sampleDate); + $('.classTable').removeAttr('style'); + $('.btn-box').removeAttr('style'); } function setColNum(name, addNum) { @@ -135,3 +136,8 @@ function setItemData(list) { }) return html; } + +function closePage(type) { + let index = parent.layer.getFrameIndex(window.name); //先得到当前 iframe层的索引 + parent.layer.close(index); //再执行关闭 +} \ No newline at end of file diff --git a/src/main/resources/static/pages/primaryData/child/viewOriginalRecord.html b/src/main/resources/static/pages/primaryData/child/viewOriginalRecord.html index 11fad43..ef26e7a 100644 --- a/src/main/resources/static/pages/primaryData/child/viewOriginalRecord.html +++ b/src/main/resources/static/pages/primaryData/child/viewOriginalRecord.html @@ -25,18 +25,18 @@

收样日期:

试验日期:

- - - - - - - - - - - - +
+ + + + + + + + + + + @@ -82,6 +82,10 @@

审核员:

第 页共 页:

+