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

新需求

This commit is contained in:
hayu 2024-09-30 14:53:19 +08:00
parent 4a462a5850
commit 1e918b7a92
5 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/resources/mappers/app/PrimaryDataAppMapper.xml
View File

@ -101,7 +101,8 @@
te.exper_conclu AS experConclu,
te.remarsk AS remarsk,
su.user_name AS experUserName,
te.audit_user_name AS auditUserName
te.audit_user_name AS auditUserName,
su.sign_img AS syUrl
FROM tb_exper te
LEFT JOIN tb_custom tc ON te.submit_unit = tc.id AND tc.del_flag = 0
LEFT JOIN sys_user su ON te.update_user = su.id AND su.del_flag = 0

3
src/main/resources/static/index.html
View File

@ -102,8 +102,9 @@
<script type="text/javascript" src="js/publicJs.js"></script>
<script type="text/javascript" src="js/my/aes.js"></script>
<script type="text/javascript" src="js/ajaxRequest.js"></script>
<script type="text/javascript" src="js/main.js"></script>
<script type="text/javascript" src="js/openIframe.js"></script>
<script type="text/javascript" src="js/main.js"></script>
</div>
</body>

4
src/main/resources/static/js/expireDataList.js
View File

@ -36,6 +36,10 @@ function pages(pageNum, pageSize, typeNum) {
}
function setParams(params){
}
function laypages(total, page, limit) {
layui.use(['laypage'], function () {
let laypage = layui.laypage;

4
src/main/resources/static/js/primaryData/child/viewOriginalRecord.js
View File

@ -97,8 +97,8 @@ function setTableInfo(obj) {
$('#sampleUnit').html(obj.customName);
$('#sampleDate').html(formatDate(obj.sampleDate));
$('#experTime').html(formatDate(obj.experTime));
$('#experUserName').html(obj.experUserName);
$('#auditUserName').html(obj.auditUserName);
document.getElementById("experUserName").src = dataUrl+"/statics/"+obj.syUrl;
document.getElementById("auditUserName").src = dataUrl+"/statics/"+obj.shUrl;
$('#titleName').html(obj.devTypeName + "检测原始记录");
devTypeName = obj.devTypeName;
$('#recordNum').html(obj.recordNum);

7
src/main/resources/static/pages/primaryData/child/viewOriginalRecord.html
View File

@ -77,10 +77,9 @@
</tr>
<tr><td style="text-align: left;padding: 0 0 0 10px;" id="illustrate" colspan="10">说明:外观状态若符合判定依据要求的则打✔，不符合要求的则打X;试验结论一栏则填符合:Y或不符合:N，不符合原因在备注一栏体现。</td></tr>
</table>
<div class="title2 layout">
<p>试验员：<span id="experUserName"></span></p>
<p>审核员：<span id="auditUserName"></span></p>
<!-- <p>第 页 共 页：</p>-->
<div class="title2 layout" style="margin-top: 5px">
<p>试验员：<img style="width: 100px" id="experUserName"/></p>
<p>审核员：<img style="width: 100px" id="auditUserName"/></p>
</div>
<div class="btn-box" style="display: none;">
<button class="layui-btn layui-btn-norma save" onclick="download()">下载</button>