From ca8f5a8f133e7f5b00b9d35ff6d15720804569af Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期三, 31 一月 2024 10:15:32 +0800
Subject: [PATCH] Merge branch 'ryzhwcs' of http://47.97.1.152:5880/r/zy-wcs into ryzhwcs
---
src/main/webapp/views/wrkMast/wrkDetl.html | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/src/main/webapp/views/wrkMast/wrkDetl.html b/src/main/webapp/views/wrkMast/wrkDetl.html
index acfae3c..721993d 100644
--- a/src/main/webapp/views/wrkMast/wrkDetl.html
+++ b/src/main/webapp/views/wrkMast/wrkDetl.html
@@ -13,10 +13,16 @@
</style>
</head>
<body>
-<div class="layui-inline" style="width:31%;margin-top: 20px">
- <label class="layui-form-label">宸� 浣� 鍙凤細</label>
+<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>
+<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="wrkDetlByMast" lay-filter="wrkDetlByMast"></table>
@@ -30,8 +36,8 @@
var pageCur;
function getCol() {
var cols = [
- {field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�'}
- ,{field: 'ioTime$', align: 'center',title: '宸ヤ綔鏃堕棿'}
+ {field: 'wrkNo', align: 'center',title: '浠诲姟鍙�'}
+ ,{field: 'ioTime$', align: 'center',title: '浠诲姟鏃堕棿'}
];
cols.push.apply(cols, detlCols);
return cols;
@@ -42,12 +48,13 @@
var form = layui.form;
$('#wrkNo').val(parent.wrkNo);
+ $('#ioTime').val(top.dateToStr(parent.ioTime, true));
// 鏁版嵁娓叉煋
tableIns1 = table.render({
elem: '#wrkDetlByMast',
headers: {token: localStorage.getItem('token')},
url: baseUrl+'/wrkDetl/list/auth',
- where: {wrk_no: parent.wrkNo},
+ where: {wrk_no: parent.wrkNo, io_time: top.dateToStr(parent.ioTime, true)},
page: true,
limit: 16,
limits: [16, 30, 50, 100, 200, 500],
--
Gitblit v1.9.1