diff --git a/src/main/resources/static/css/basis/originalRecord.css b/src/main/resources/static/css/basis/originalRecord.css new file mode 100644 index 0000000..938af18 --- /dev/null +++ b/src/main/resources/static/css/basis/originalRecord.css @@ -0,0 +1,87 @@ +/*表格/查询条件公共样式*/ +html, +body { + width: 99.5%; + /*height: calc(100% - 5px);*/ + height: 99%; + margin: 0.15% 0 0 0.25%; + padding: 0; + font-family: 'Alibaba PuHuiTi R'; + letter-spacing: 1px; +} + +.layout { + display: flex; + align-items: center; + justify-content: start; + box-sizing: border-box; +} + +#content { + width: 100%; + height: 100%; + padding: 1% 2% 1% 2%; + box-sizing: border-box; + background-color: #fff; + overflow: auto; +} + +.layui-form p { + font-size: 18px; + font-weight: bold; +} + +.layui-form-item .layui-input-inline { + width: 350px; +} + +.yj{ + width: 725px !important; +} + +.layui-form-label { + padding: 9px 0; + width: 150px; + font-size: 16px; + text-align: left; +} + +.layui-input { + border-color: #c7c5c5 !important; +} + +.layui-input:hover, .layui-textarea:hover { + border-color: #8b8989 !important; +} + +hr { + border-bottom: 1px solid #c7c5c5; +} + +/*滚动条样式start*/ +::-webkit-scrollbar { + width: 5px; + height: 10px; +} + +::-webkit-scrollbar-track { + background: #e7e7f1 !important; + border-radius: 0px; +} + +::-webkit-scrollbar-thumb { + background: rgba(94, 96, 97, 0.43) !important; + border-radius: 0px; +} + +::-webkit-scrollbar-thumb:hover { + background: rgba(94, 96, 97, 0.43) !important; + border-radius: 0px; +} + +::-webkit-scrollbar-thumb:active { + background: rgba(94, 96, 97, 0.43) !important; + border-radius: 0px; +} + +/*滚动条样式end*/ \ No newline at end of file diff --git a/src/main/resources/static/js/basis/child/auditData.js b/src/main/resources/static/js/basis/child/auditData.js index 362a47c..ff86c85 100644 --- a/src/main/resources/static/js/basis/child/auditData.js +++ b/src/main/resources/static/js/basis/child/auditData.js @@ -96,15 +96,16 @@ function initTable(dataList, limit, page) { { title: "原始记录", unresize: true, align: "center", templet: function (d) { let html = ''; - html += "查看"; + html += "查看"; return html; }}, { title: "操作", unresize: true, width: 180, align: "center", templet: function (d) { let html = ''; - // html += ""; - html += setButtonName(d.id, d.roleCode, d.status); + html += "通过"; + html += "不通过"; + // html += setButtonName(d.id, d.roleCode, d.status); return html; } }, @@ -169,39 +170,12 @@ function reloadData() { pages(pageNum, limitSize); } -// 审核数据 -function auditData(id, status, btnName) { - let title = btnName +// 原始数据查看 +function viewData(experId,devTypeCode) { + let title = '原始记录'; let param = { - 'id': id, - 'status': status + 'experId': experId, + 'devTypeCode': devTypeCode } - openIframe3("auditData", title, "child/auditData.html", '1500px', '800px', param); -} - -const data = { - administrators1: '审阅', - administrators2: '审核', - administrators3: '审批', - experimentalTeamLeader1: '审阅', - technicalDirector2: '审核', - centerManager3: '审批' -}; - -function getValueByKey(obj, key) { - return obj[key]; -} - -/**设置审核类型*/ -function setButtonName(id, value, status) { - let cent = ""; - const btnName = getValueByKey(data, value + status) - if (btnName) { - cent += "" + btnName + ""; - } - return cent; -} - -function seta() { - alert('12') + openIframe7("viewData", title, "child/viewExperData.html", '1500px', '800px', param); } \ No newline at end of file diff --git a/src/main/resources/static/js/basis/child/viewExperData.js b/src/main/resources/static/js/basis/child/viewExperData.js new file mode 100644 index 0000000..b0b099b --- /dev/null +++ b/src/main/resources/static/js/basis/child/viewExperData.js @@ -0,0 +1,10 @@ +let form, layer; +let experIdParam = null,devTypeCodeParam = null; +function setParams(params) { + experIdParam = JSON.parse(params).experId; + devTypeCodeParam = JSON.parse(params).devTypeCode; + layui.use(['form', 'layer'], function () { + form = layui.form; + layer = layui.layer; + }) +} \ No newline at end of file diff --git a/src/main/resources/static/js/basis/examine.js b/src/main/resources/static/js/basis/examine.js index 73c7187..035bfd8 100644 --- a/src/main/resources/static/js/basis/examine.js +++ b/src/main/resources/static/js/basis/examine.js @@ -90,7 +90,7 @@ function initTable(dataList, limit, page) { {field: "teamName", title: "试验班组", unresize: true, align: "center"}, {field: "audtiStatus", title: "状态", unresize: true, align: "center"}, { - title: "操作", unresize: true, width: 180, align: "center", + title: "审查", unresize: true, width: 180, align: "center", templet: function (d) { let html = ''; // html += ""; diff --git a/src/main/resources/static/js/openIframe.js b/src/main/resources/static/js/openIframe.js index 723ba18..f930c62 100644 --- a/src/main/resources/static/js/openIframe.js +++ b/src/main/resources/static/js/openIframe.js @@ -65,6 +65,24 @@ function openIframe3(id, title, content, width, height, params) { }); } +function openIframe7(id, title, content, width, height, params) { + let layerIndex = parent.layer.open({ + id: id, + type: 2, + title: ['