From 8e943b7104561c3b14cf223016698709c5ade4b5 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期二, 03 二月 2026 15:37:26 +0800
Subject: [PATCH] #pda料箱组托和换码
---
src/main/webapp/views/order/out.html | 203 ++++++++++++++++++++++++++++++++++++++------------
1 files changed, 152 insertions(+), 51 deletions(-)
diff --git a/src/main/webapp/views/order/out.html b/src/main/webapp/views/order/out.html
index 597a12b..98b3eb7 100644
--- a/src/main/webapp/views/order/out.html
+++ b/src/main/webapp/views/order/out.html
@@ -21,19 +21,44 @@
margin: 0 !important;
}
+ .layui-table-view .layui-table-cell .layui-select-title .layui-input {
+ height: 28px;
+ line-height: 28px;
+ }
+
+ .layui-table-view [lay-size="lg"] .layui-table-cell .layui-select-title .layui-input {
+ height: 40px;
+ line-height: 40px;
+ }
+
+ .layui-table-view [lay-size="lg"] .layui-table-cell .layui-select-title .layui-input {
+ height: 40px;
+ line-height: 40px;
+ }
+
+ .layui-table-view [lay-size="sm"] .layui-table-cell .layui-select-title .layui-input {
+ height: 20px;
+ line-height: 20px;
+ }
+
+ .layui-table-view [lay-size="sm"] .layui-table-cell .layui-btn-xs {
+ height: 18px;
+ line-height: 18px;
+ }
+
/* 鏉冮檺鎺у埗 */
- #btn-add {
+ #btn-pakoutPreview {
display: none;
}
- #btn-delete {
- display: none;
- }
- .btn-edit {
- display: none;
- }
- .btn-more {
- display: none;
- }
+ /*#btn-delete {*/
+ /* display: none;*/
+ /*}*/
+ /*.btn-edit {*/
+ /* display: none;*/
+ /*}*/
+ /*.btn-more {*/
+ /* display: none;*/
+ /*}*/
</style>
</head>
<body>
@@ -47,14 +72,14 @@
<form class="layui-form toolbar">
<div class="layui-form-item">
<div class="layui-inline" style="max-width: 300px;">
- <input name="orderNo" class="layui-input" placeholder="杈撳叆鍗曟嵁缂栧彿" autocomplete="off"/>
+ <input name="orderNo" class="layui-input" placeholder="杈撳叆鍗曟嵁缂栧彿" data-i18n="input_order_no" autocomplete="off"/>
</div>
<div class="layui-inline">
<button class="layui-btn icon-btn" lay-filter="originTableSearch" lay-submit>
- <i class="layui-icon"></i>鎼滅储
+ <i class="layui-icon"></i><span data-i18n="search">鎼滅储</span>
</button>
<button class="layui-btn icon-btn" lay-filter="originTbReset" lay-submit>
- <i class="layui-icon"></i>閲嶇疆
+ <i class="layui-icon"></i><span data-i18n="reset">閲嶇疆</span>
</button>
</div>
</div>
@@ -70,24 +95,36 @@
<form class="layui-form toolbar">
<div class="layui-form-item">
<div class="layui-inline">
- <label class="layui-form-label">璁惧缂栧彿:</label>
+ <label class="layui-form-label"><span data-i18n="mat_code">鍟嗗搧缂栫爜</span>:</label>
<div class="layui-input-inline">
- <input name="uuid" class="layui-input" placeholder="璁惧缂栧彿"/>
+ <input name="matnr" class="layui-input" placeholder="鍟嗗搧缂栫爜" data-i18n="mat_code"/>
</div>
</div>
-<!-- <div class="layui-inline">-->
-<!-- <label class="layui-form-label">鐘舵��:</label>-->
-<!-- <div class="layui-input-inline">-->
-<!-- <select name="isOnline">-->
-<!-- <option value="1">鍏呯數涓�</option>-->
-<!-- <option value="1">鍏呯數涓�</option>-->
-<!-- <option value="0">涓嶅湪鍏呯數</option>-->
-<!-- </select>-->
-<!-- </div>-->
-<!-- </div>-->
+ <div class="layui-inline">
+ <label class="layui-form-label"><span data-i18n="mat_name">鍟嗗搧鍚嶇О</span>:</label>
+ <div class="layui-input-inline">
+ <input name="maktx" class="layui-input" placeholder="鍟嗗搧鍚嶇О" data-i18n="mat_name"/>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label"><span data-i18n="serial_code">搴忓垪鐮�</span>:</label>
+ <div class="layui-input-inline">
+ <input name="batch" class="layui-input" placeholder="搴忓垪鐮�" data-i18n="serial_code"/>
+ </div>
+ </div>
+ <!-- <div class="layui-inline">-->
+ <!-- <label class="layui-form-label">鐘舵��:</label>-->
+ <!-- <div class="layui-input-inline">-->
+ <!-- <select name="isOnline">-->
+ <!-- <option value="1">鍏呯數涓�</option>-->
+ <!-- <option value="1">鍏呯數涓�</option>-->
+ <!-- <option value="0">涓嶅湪鍏呯數</option>-->
+ <!-- </select>-->
+ <!-- </div>-->
+ <!-- </div>-->
<div class="layui-inline"> 
<button class="layui-btn icon-btn" lay-filter="sensorTbSearch" lay-submit>
- <i class="layui-icon"></i>鎼滅储
+ <i class="layui-icon"></i><span data-i18n="search">鎼滅储</span>
</button>
</div>
</div>
@@ -101,26 +138,76 @@
<!-- 澶村伐鍏锋爮 -->
<script type="text/html" id="orderDetToolbar">
- <div class="layui-btn-container">
- <button class="layui-btn layui-btn-sm layui-btn-normal" id="btn-add" lay-event="add"><i class="layui-icon"></i>鏂板</button>
- <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="del"><i class="layui-icon"></i>鍒犻櫎</button>
- </div>
+
+ <!-- <div class="layui-btn-container">-->
+ <!-- <div class="layui-col-md3">-->
+ <!-- <select id="staNoSelect" lay-verify="required">-->
+ <!-- <option value="">璇烽�夋嫨绔欑偣</option>-->
+ <!-- </select>-->
+ <!-- </div>-->
+ <!-- </div>-->
+ <button class="layui-btn layui-btn-sm layui-btn-danger btn-pakoutPreview" id="btn-pakoutPreview" lay-event="pakoutPreview"><span>{{ I18n.t('batch_outbound') }}</span></button>
+
</script>
<!-- 琛屽伐鍏锋爮 -->
<script type="text/html" id="operate">
- <a class="layui-btn layui-btn-xs btn-edit" lay-event="detl" ew-event="popupRight"
- data-type="1" data-window="top" data-area="1250px" data-url="sensor5/sensor_detl.html">
- <i class="layui-icon"></i>鏌ョ湅</a>
- <a class="layui-btn layui-btn-xs layui-btn-primary btn-edit" lay-event="edit"><i class="layui-icon layui-icon-edit"></i>淇敼</a>
+ {{#if (d.enableQty > 0){ }}
+ <a class="layui-btn layui-btn-xs layui-btn-danger btn-pakoutPreview" lay-event="pakoutPreview"><i class="layui-icon layui-icon-prev-circle"></i><span>{{ I18n.t('outbound') }}</span></a>
+ {{# } }}
+</script>
+
+<!-- 鍑哄簱棰勮 -->
+<script type="text/html" id="pakoutPreviewBox" style="display: none">
+ <div style="padding: 25px; line-height: 22px; background-color: #393D49; color: #fff; font-weight: 300;">
+ <span style="font-size: large; font-weight: bold" data-i18n="outbound_preview">鍑哄簱棰勮</span>
+ </div>
+ <div class="layui-card">
+ <div class="layui-card-body" style="padding: 10px">
+ <table id="stoPreTab" lay-filter="stoPreTab"></table>
+ </div>
+ <button class="layui-btn layui-btn-primary layui-border-black layui-btn-sm" lay-filter="batchModifySta" lay-submit style="display: block;float: right;margin-right: 1rem" data-i18n="batch_modify">
+ 鎵归噺淇敼
+ </button>
+ </div>
+</script>
+
+<script type="text/html" id="tbBasicTbStaNos">
+ <div class="ew-select-fixed">
+ <select class="order-sta-select" lay-filter="tbBasicTbStaNos">
+ <option value="" data-i18n="please_select">璇烽�夋嫨</option>
+ {{#if (d.staNos!=null) {}}
+ {{# for(let i=0; i<d.staNos.length; i++) { }}
+ <option value="{{d.staNos[i]}}">{{d.staNos[i]}}</option>
+ {{# } }}
+ {{# } }}
+ </select>
+ </div>
+</script>
+
+<script type="text/html" id="staBatchSelectDialog">
+ <form class="layui-form" style="padding: 25px 50px 30px 50px;text-align: center">
+ <select id="batchSelectStaBox" name="batchSta" lay-vertype="tips" lay-verify="required" required="">
+ </select>
+ <button style="margin-top: 30px" class="layui-btn" lay-filter="staBatchSelectConfirm" lay-submit="" data-i18n="confirm">纭畾</button>
+ </form>
+</script>
+
+<script type="text/html" id="locNoTpl">
+ <span name="locNo"
+ {{# if( d.lack === false){ }}
+ class="layui-badge layui-badge-green" >{{d.locNo}}</span>
+ {{# } else { }}
+ class="layui-badge layui-badge-red">{{ I18n.t('stock_shortage') }}</span>
+ {{# } }}
</script>
<!-- 琛屾牱寮� -->
-<script type="text/html" id="hostTpl">
- <span name="hostId$" class="layui-badge layui-badge-gray">{{d.hostId$}}</span>
+<script type="text/html" id="orderNoTpl">
+ <span name="orderNo" class="layui-badge layui-badge-gray">{{d.orderNo}}</span>
</script>
<script type="text/html" id="statusTpl">
- <input type="checkbox" name="status" value="{{d.status}}" lay-skin="switch" lay-text="姝ｅ父|绂佺敤" lay-filter="statusSwitch" {{ d.status === 1 ? 'checked' : '' }}>
+ <input type="checkbox" name="status" value="{{d.status}}" lay-skin="switch" lay-text="{{ I18n.t('normal') }}|{{ I18n.t('status_disabled') }}" lay-filter="statusSwitch" {{ d.status === 1 ? 'checked' : '' }}>
</script>
<!-- 琛ㄥ崟寮圭獥 -->
@@ -132,15 +219,15 @@
<div class="layui-col-md4">
<div class="layui-form-item">
- <label class="layui-form-label layui-form-required">璁惧缂栧彿</label>
+ <label class="layui-form-label layui-form-required" data-i18n="device_code">璁惧缂栧彿</label>
<div class="layui-input-block">
- <input name="uuid" placeholder="璇疯緭鍏ヨ澶囩紪鍙�" class="layui-input" lay-vertype="tips" lay-verify="required" required="">
+ <input name="uuid" placeholder="璇疯緭鍏ヨ澶囩紪鍙�" class="layui-input" lay-vertype="tips" lay-verify="required" required="" data-i18n="[placeholder]enter_device_code">
</div>
</div>
</div>
<div class="layui-col-md4">
<div class="layui-form-item">
- <label class="layui-form-label">璁惧绫诲瀷锛�</label>
+ <label class="layui-form-label" data-i18n="device_type">璁惧绫诲瀷锛�</label>
<div class="layui-input-block">
<div id="modelSel" class="ew-xmselect-tree"></div>
</div>
@@ -148,10 +235,10 @@
</div>
<div class="layui-col-md4">
<div class="layui-form-item">
- <label class="layui-form-label layui-form-required">鎵�灞為」鐩�: </label>
+ <label class="layui-form-label layui-form-required" data-i18n="project">鎵�灞為」鐩�: </label>
<div class="layui-input-block cool-auto-complete">
<input name="hostId" class="layui-input" style="display: none">
- <input id="hostId$" name="hostId$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇烽�夋嫨鎵�灞為」鐩�" onfocus=this.blur()>
+ <input id="hostId$" name="hostId$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇烽�夋嫨鎵�灞為」鐩�" onfocus=this.blur() data-i18n="[placeholder]select_project">
<div class="cool-auto-complete-window">
<input class="cool-auto-complete-window-input" data-key="hostQueryByhostId" onkeyup="autoLoad(this.getAttribute('data-key'))">
<select class="cool-auto-complete-window-select" data-key="hostQueryByhostIdSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
@@ -162,9 +249,9 @@
</div>
<div class="layui-col-md12">
<div class="layui-form-item">
- <label class="layui-form-label">璇︾粏鍦板潃</label>
+ <label class="layui-form-label" data-i18n="address">璇︾粏鍦板潃</label>
<div class="layui-input-block">
- <input name="addr" placeholder="璇疯緭鍏ヨ缁嗗湴鍧�" class="layui-input">
+ <input name="addr" placeholder="璇疯緭鍏ヨ缁嗗湴鍧�" class="layui-input" data-i18n="[placeholder]enter_address">
</div>
</div>
</div>
@@ -178,8 +265,8 @@
</div>
<hr class="layui-bg-gray">
<div class="layui-form-item text-right">
- <button class="layui-btn" lay-filter="editSubmit" lay-submit="">淇濆瓨</button>
- <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
+ <button class="layui-btn" lay-filter="editSubmit" lay-submit="" data-i18n="save">淇濆瓨</button>
+ <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog" data-i18n="cancel">鍙栨秷</button>
</div>
</form>
</script>
@@ -189,27 +276,41 @@
<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 src="../../static/js/i18n/i18n-helper.js"></script>
<script type="text/javascript" src="../../static/js/tools/md5.js"></script>
<script type="text/javascript" src="../../static/js/orderTable.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/order/out.js" charset="utf-8"></script>
-
+<!--<script type="text/template" id="takeSiteSelectTemplate">-->
+<!-- {{#each data}}-->
+<!-- <option value="{{siteId}}">{{desc}}</option>-->
+<!-- {{/each}}-->
+<!--</script>-->
<!-- 椤圭洰缂栬緫绐楀彛 -->
<script type="text/html" id="hostEditDialog">
<form id="hostEditForm" lay-filter="hostEditForm" class="layui-form model-form">
<input name="id" type="hidden"/>
<div class="layui-form-item">
- <label class="layui-form-label layui-form-required">椤圭洰鍚嶇О:</label>
+ <label class="layui-form-label layui-form-required" data-i18n="project_name">椤圭洰鍚嶇О:</label>
<div class="layui-input-block">
<input name="name" placeholder="璇疯緭鍏ョ被鍨嬪悕绉�" class="layui-input"
- lay-verType="tips" lay-verify="required" required/>
+ lay-verType="tips" lay-verify="required" required data-i18n="[placeholder]enter_type_name"/>
</div>
</div>
<div class="layui-form-item text-right">
- <button class="layui-btn" lay-filter="hostEditSubmit" lay-submit>淇濆瓨</button>
- <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
+ <button class="layui-btn" lay-filter="hostEditSubmit" lay-submit data-i18n="save">淇濆瓨</button>
+ <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog" data-i18n="cancel">鍙栨秷</button>
</div>
</form>
</script>
+
</body>
+
+<script type="text/template" id="batchStaSelectTpl">
+ <option value="">{{ I18n.t('select_outbound_station_opt') }}</option>
+ {{#each list}}
+ <option value="{{this}}">{{this}}</option>
+ {{/each}}
+</script>
+
</html>
--
Gitblit v1.9.1