From d759220378927d1481882de1c7c476ac47ce2dea Mon Sep 17 00:00:00 2001
From: TQS <56479841@qq.com>
Date: 星期二, 29 十一月 2022 21:35:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bfasrs' into bfasrs
---
src/main/webapp/views/wrkMast/wrkMast_detail.html | 315 +++++++++++++++++++++++++++-------------------------
1 files changed, 165 insertions(+), 150 deletions(-)
diff --git a/src/main/webapp/views/wrkMast/wrkMast_detail.html b/src/main/webapp/views/wrkMast/wrkMast_detail.html
index 79601ad..7a01f37 100644
--- a/src/main/webapp/views/wrkMast/wrkMast_detail.html
+++ b/src/main/webapp/views/wrkMast/wrkMast_detail.html
@@ -1,5 +1,5 @@
<!DOCTYPE html>
-<html lang="en">
+<html lang="en" xmlns="http://www.w3.org/1999/html">
<head>
<meta charset="utf-8">
<title></title>
@@ -14,18 +14,30 @@
<!-- 璇︽儏 -->
<div id="data-detail" class="layer_self_wrap">
- <form id="detail" class="layui-form">
- <div class="layui-inline" style="width:31%;">
+ <form id="detail" class="layui-form" style="height: 100%">
+ <div class="layui-inline" >
<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, 'wrkMast')">
+ <input id="wrkNo" class="layui-input" disabled =鈥渄isabled鈥� onkeyup="check(this.id, 'wrkMast')">
</div>
</div>
- <div class="layui-inline" style="width:31%;">
+<!-- <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" 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">
<label class="layui-form-label">宸ヤ綔鐘舵�侊細</label>
- <div class="layui-input-inline cool-auto-complete">
- <input id="wrkSts" class="layui-input" type="text" 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="layui-input-inline cool-auto-complete" style="height: 200px">
+ <input id="wrkSts" class="layui-input" name="wrk_sts" type="text" placeholder="璇疯緭鍏�" autocomplete="off" 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">
@@ -33,157 +45,160 @@
</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" 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" 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">
- </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" 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" 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="refIotime$" 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="memo" 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="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>
+<!-- <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" 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" 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">-->
+<!-- </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" 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" 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="refIotime$" 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="memo" 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="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">
+<!-- <hr class="layui-bg-gray">-->
+ <div id="prompt">
+ 娓╅Θ鎻愮ず锛氬ぇ浜�10鐨勫伐浣滅姸鎬佽鏌ョ湅 鍩虹鏁版嵁<span style="font-weight: 900;color: black">鈫�</span>宸ヤ綔鐘舵��
+ </div>
<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>
+<!-- <div id="prompt">-->
+<!-- 娓╅Θ鎻愮ず锛氳浠旂粏濉啓鐩稿叧淇℃伅锛�<span class="extrude"><span class="not-null">*</span> 涓哄繀濉�夐」銆�</span>-->
+<!-- </div>-->
</form>
</div>
</body>
--
Gitblit v1.9.1