From 44c6df2e7b14b2126b0157b07803ac83047d7829 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期五, 26 十二月 2025 16:20:20 +0800
Subject: [PATCH] #agv任务
---
src/main/webapp/views/taskLog/taskLog_detail.html | 244 +++++++++++++-----------------------------------
1 files changed, 67 insertions(+), 177 deletions(-)
diff --git a/src/main/webapp/views/taskLog/taskLog_detail.html b/src/main/webapp/views/taskLog/taskLog_detail.html
index c6807ff..db69dd2 100644
--- a/src/main/webapp/views/taskLog/taskLog_detail.html
+++ b/src/main/webapp/views/taskLog/taskLog_detail.html
@@ -1,8 +1,9 @@
<!DOCTYPE html>
<html lang="en">
+
<head>
<meta charset="utf-8">
- <title></title>
+ <title>浠诲姟鏄庣粏鏃ュ織</title>
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
@@ -10,187 +11,76 @@
<link rel="stylesheet" href="../../static/css/cool.css" media="all">
<link rel="stylesheet" href="../../static/css/common.css" media="all">
</head>
+
<body>
-
-<!-- 璇︽儏 -->
-<div id="data-detail" class="layer_self_wrap">
- <form id="detail" class="layui-form">
- <div class="layui-inline" style="width:31%;display: none">
- <label class="layui-form-label"><span class="not-null">*</span>缂栥��銆�鍙凤細</label>
- <div class="layui-input-inline">
- <input id="id" class="layui-input" type="text" onkeyup="check(this.id, 'wrkMastLog')" lay-verify="number" >
- </div>
+ <div class="layui-inline" style="width:31%;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 class="layui-inline" style="width:31%;">
- <label class="layui-form-label"><span class="not-null">*</span>宸� 浣� 鍙凤細</label>
- <div class="layui-input-inline">
- <input id="wrkNo" class="layui-input" type="text" onkeyup="check(this.id, 'wrkMastLog')" lay-verify="required|number" >
- </div>
- </div>
- <div class="layui-inline" style="width:31%;">
- <label class="layui-form-label">宸ヤ綔鐘舵�侊細</label>
- <div class="layui-input-inline cool-auto-complete">
- <input id="wrkSts" class="layui-input" type="text" lay-verify="number" style="display: none">
- <input id="wrkSts$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏�..." onfocus=this.blur()>
- <div class="cool-auto-complete-window">
- <input class="cool-auto-complete-window-input" data-key="basWrkStatusQueryBywrkSts" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="basWrkStatusQueryBywrkStsSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
- </select>
- </div>
- </div>
- </div>
- <div class="layui-inline" style="width:31%;">
- <label class="layui-form-label">鍏ュ嚭搴撶被鍨嬶細</label>
- <div class="layui-input-inline cool-auto-complete">
- <input id="ioType" class="layui-input" type="text" lay-verify="number" style="display: none">
- <input id="ioType$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏�..." onfocus=this.blur()>
- <div class="cool-auto-complete-window">
- <input class="cool-auto-complete-window-input" data-key="basWrkIotypeQueryByioType" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="basWrkIotypeQueryByioTypeSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
- </select>
- </div>
- </div>
- </div>
- <div class="layui-inline" style="width:31%;">
- <label class="layui-form-label">鍫嗗灈鏈哄彿锛�</label>
- <div class="layui-input-inline cool-auto-complete">
- <input id="crnNo" class="layui-input" type="text" lay-verify="number" style="display: none">
- <input id="crnNo$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏�..." onfocus=this.blur()>
- <div class="cool-auto-complete-window">
- <input class="cool-auto-complete-window-input" data-key="basCrnpQueryBycrnNo" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="basCrnpQueryBycrnNoSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
- </select>
- </div>
- </div>
- </div>
- <div class="layui-inline" style="width:31%;">
- <label class="layui-form-label">浼� 鍏� 绾э細</label>
- <div class="layui-input-inline">
- <input id="ioPri" class="layui-input" type="text" lay-verify="number" >
- </div>
- </div>
- <div class="layui-inline" style="width:31%;">
- <label class="layui-form-label">鐩爣搴撲綅锛�</label>
- <div class="layui-input-inline cool-auto-complete">
- <input id="locNo" class="layui-input" type="text" style="display: none">
- <input id="locNo$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏�..." onfocus=this.blur()>
- <div class="cool-auto-complete-window">
- <input class="cool-auto-complete-window-input" data-key="locMastQueryBylocNo" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="locMastQueryBylocNoSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
- </select>
- </div>
- </div>
- </div>
- <div class="layui-inline" style="width:31%;">
- <label class="layui-form-label">鐩� 鏍� 绔欙細</label>
- <div class="layui-input-inline cool-auto-complete">
- <input id="staNo" class="layui-input" type="text" lay-verify="number" style="display: none">
- <input id="staNo$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏�..." onfocus=this.blur()>
- <div class="cool-auto-complete-window">
- <input class="cool-auto-complete-window-input" data-key="basDevpQueryBystaNo" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="basDevpQueryBystaNoSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
- </select>
- </div>
- </div>
- </div>
- <div class="layui-inline" style="width:31%;">
- <label class="layui-form-label">婧愩��銆�绔欙細</label>
- <div class="layui-input-inline cool-auto-complete">
- <input id="sourceStaNo" class="layui-input" type="text" lay-verify="number" style="display: none">
- <input id="sourceStaNo$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏�..." onfocus=this.blur()>
- <div class="cool-auto-complete-window">
- <input class="cool-auto-complete-window-input" data-key="basDevpQueryBysourceStaNo" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="basDevpQueryBysourceStaNoSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
- </select>
- </div>
- </div>
- </div>
- <div class="layui-inline" style="width:31%;">
- <label class="layui-form-label">婧� 搴� 浣嶏細</label>
- <div class="layui-input-inline cool-auto-complete">
- <input id="sourceLocNo" class="layui-input" type="text" style="display: none">
- <input id="sourceLocNo$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏�..." onfocus=this.blur()>
- <div class="cool-auto-complete-window">
- <input class="cool-auto-complete-window-input" data-key="locMastQueryBysourceLocNo" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="locMastQueryBysourceLocNoSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
- </select>
- </div>
- </div>
- </div>
- <div class="layui-inline" style="width:31%;">
- <label class="layui-form-label">鎷ｃ��銆�鏂欙細</label>
- <div class="layui-input-inline">
- <input id="picking" class="layui-input" type="checkBox" lay-skin="primary" lay-filter='detailCheckbox'>
- </div>
- </div>
- <div class="layui-inline" style="width:31%;">
- <label class="layui-form-label">閫�銆�銆�鍑猴細</label>
- <div class="layui-input-inline">
- <input id="exitMk" class="layui-input" type="checkBox" lay-skin="primary" lay-filter='detailCheckbox'>
- </div>
- </div>
- <div class="layui-inline" style="width:31%;">
- <label class="layui-form-label">绌恒��銆�鏉匡細</label>
- <div class="layui-input-inline">
- <input id="emptyMk" class="layui-input" type="checkBox" lay-skin="primary" lay-filter='detailCheckbox'>
- </div>
- </div>
- <div class="layui-inline" style="width:31%;">
- <label class="layui-form-label">宸ヤ綔鏃堕棿锛�</label>
- <div class="layui-input-inline">
- <input id="ioTime$" class="layui-input" type="text" autocomplete="off">
- </div>
- </div>
- <div class="layui-inline" style="width:31%;">
- <label class="layui-form-label" style="font-size: x-small">鍫嗗灈鏈哄惎鍔ㄦ椂闂达細</label>
- <div class="layui-input-inline">
- <input id="crnStrTime$" class="layui-input" type="text" autocomplete="off">
- </div>
- </div>
- <div class="layui-inline" style="width:31%;">
- <label class="layui-form-label" style="font-size: x-small">鍫嗗灈鏈哄仠姝㈡椂闂达細</label>
- <div class="layui-input-inline">
- <input id="crnEndTime$" class="layui-input" type="text" autocomplete="off">
- </div>
- </div>
- <div class="layui-inline" style="width:31%;">
- <label class="layui-form-label">鎷ｆ枡鏃堕棿锛�</label>
- <div class="layui-input-inline">
- <input id="plcStrTime$" class="layui-input" type="text" autocomplete="off">
- </div>
- </div>
- <div class="layui-inline" style="width:31%;">
- <label class="layui-form-label">鏉°��銆�鐮侊細</label>
- <div class="layui-input-inline">
- <input id="barcode" class="layui-input" type="text">
- </div>
- </div>
- <div class="layui-inline" style="width:31%;">
- <label class="layui-form-label">婊°��銆�鏉匡細</label>
- <div class="layui-input-inline">
- <input id="fullPlt" class="layui-input" type="checkBox" lay-skin="primary" lay-filter='detailCheckbox'>
- </div>
- </div>
-
-
- <hr class="layui-bg-gray">
-
- <div id="data-detail-btn" class="layui-btn-container layui-form-item">
- <div id="data-detail-submit-save" type="button" class="layui-btn layui-btn-normal" lay-submit lay-filter="save">淇濆瓨</div>
- <div id="data-detail-submit-edit" type="button" class="layui-btn layui-btn-normal" lay-submit lay-filter="edit">淇敼</div>
- <div id="data-detail-close" type="button" class="layui-btn" lay-submit lay-filter="close">鍏抽棴</div>
- </div>
-
- <div id="prompt">
- 娓╅Θ鎻愮ず锛氳浠旂粏濉啓鐩稿叧淇℃伅锛�<span class="extrude"><span class="not-null">*</span> 涓哄繀濉�夐」銆�</span>
- </div>
- </form>
-</div>
+ </div>
+ <table class="layui-hide" id="taskDetlLog" lay-filter="taskDetlLog"></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>
<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/wrkMastLog/wrkMastLog.js" charset="utf-8"></script>
-</html>
+<script type="text/javascript">
+ var pageCur;
+ layui.use(['table', 'laydate', 'form'], function () {
+ var table = layui.table;
+ var $ = layui.jquery;
+ var form = layui.form;
+
+ $('#wrkNo').val(parent.wrkNo);
+ // 鏁版嵁娓叉煋
+ table.render({
+ elem: '#taskDetlLog',
+ headers: { token: localStorage.getItem('token') },
+ url: baseUrl + '/taskDetlLog/list/auth',
+ where: { task_id: parent.id },
+ page: true,
+ limit: 16,
+ limits: [16, 30, 50, 100, 200, 500],
+ even: true,
+ cellMinWidth: 50,
+ cols: [[
+ { field: 'wrkNo', align: 'center', title: '宸ヤ綔鍙�', width: 100 }
+ , { field: 'ioTime$', align: 'center', title: '宸ヤ綔鏃堕棿', width: 160 }
+ , { field: 'matnr', align: 'center', title: '鐗╂枡缂栫爜', width: 120 }
+ , { field: 'maktx', align: 'center', title: '鐗╂枡鍚嶇О' }
+ , { field: 'anfme', align: 'center', title: '鏁伴噺', width: 80 }
+ , { field: 'batch', align: 'center', title: '鎵规', width: 100 }
+ , { field: 'orderNo', align: 'center', title: '鍗曟嵁缂栧彿', width: 120 }
+ , { field: 'zpallet', align: 'center', title: '鎵樼洏鏉＄爜', width: 120 }
+ , { field: 'specs', align: 'center', title: '瑙勬牸' }
+ , { field: 'unit', align: 'center', title: '鍗曚綅', width: 60 }
+ , { field: 'supp', align: 'center', title: '渚涘簲鍟�' }
+ ]],
+ request: {
+ pageName: 'curr',
+ pageSize: 'limit'
+ },
+ parseData: function (res) {
+ return {
+ 'code': res.code,
+ 'msg': res.msg,
+ 'count': res.data.total,
+ 'data': res.data.records
+ }
+ },
+ response: {
+ statusCode: 200
+ },
+ done: function (res, curr, count) {
+ if (res.code === 403) {
+ top.location.href = baseUrl + "/";
+ }
+ pageCur = curr;
+ }
+ });
+ });
+</script>
+
+</html>
\ No newline at end of file
--
Gitblit v1.9.1