From 6f7a815b2d6e4f30e7ccf901b24d5103aaa72078 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期一, 25 十二月 2023 10:23:08 +0800
Subject: [PATCH] Merge branch 'tzskasrs-1' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs-1
---
src/main/webapp/views/wrkMastLog/wrkDetlLog.html | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/src/main/webapp/views/wrkMastLog/wrkDetlLog.html b/src/main/webapp/views/wrkMastLog/wrkDetlLog.html
index af87049..a279de3 100644
--- a/src/main/webapp/views/wrkMastLog/wrkDetlLog.html
+++ b/src/main/webapp/views/wrkMastLog/wrkDetlLog.html
@@ -13,13 +13,20 @@
</style>
</head>
<body>
-<div class="layui-inline" style="width:31%;margin-top: 20px">
+<div class="layui-inline" style="width:20%;margin-top: 20px">
<label class="layui-form-label">宸� 浣� 鍙凤細</label>
<div class="layui-input-inline">
<input id="wrkNo" class="layui-input" type="text" disabled="disabled">
</div>
</div>
-<table class="layui-hide" id="wrkDetlByMast" lay-filter="wrkDetlByMast"></table>
+<div class="layui-inline" style="width:20%;margin-top: 20px">
+ <label class="layui-form-label">宸ヤ綔鏃堕棿锛�</label>
+ <div class="layui-input-inline">
+ <input id="ioTime" class="layui-input" type="text" disabled="disabled">
+ </div>
+</div>
+
+<table class="layui-hide" id="wrkDetlLogByMast" lay-filter="wrkDetlLogByMast"></table>
</body>
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
@@ -29,9 +36,9 @@
<script type="text/javascript">
var pageCur;
function getCol() {
- var cols = [
+ let cols = [
{field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�'}
- ,{field: 'ioTime$', align: 'center',title: '宸ヤ綔鏃堕棿'}
+ ,{field: 'ioTime$', align: 'center',title: '宸ヤ綔鏃堕棿',width:160}
];
cols.push.apply(cols, detlCols);
return cols;
@@ -42,12 +49,13 @@
var form = layui.form;
$('#wrkNo').val(parent.wrkNo);
+ $('#ioTime').val(top.dateToStr(parent.ioTime, true));
// 鏁版嵁娓叉煋
tableIns1 = table.render({
- elem: '#wrkDetlByMast',
+ elem: '#wrkDetlLogByMast',
headers: {token: localStorage.getItem('token')},
- url: baseUrl+'/wrkDetl/list/auth',
- where: {wrk_no: parent.wrkNo},
+ url: baseUrl+'/wrkDetlLogByMast/list/auth',
+ where: {wrk_no: parent.wrkNo,ioTime: top.dateToStr(parent.ioTime, true)},
page: true,
limit: 16,
limits: [16, 30, 50, 100, 200, 500],
--
Gitblit v1.9.1