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/order.html |  210 ++++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 176 insertions(+), 34 deletions(-)

diff --git a/src/main/webapp/views/order/order.html b/src/main/webapp/views/order/order.html
index 7458c87..f2f5a1a 100644
--- a/src/main/webapp/views/order/order.html
+++ b/src/main/webapp/views/order/order.html
@@ -8,13 +8,23 @@
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
     <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
     <link rel="stylesheet" href="../../static/css/admin.css?v=318" media="all">
-        <link rel="stylesheet" href="../../static/css/cool.css" media="all">
+    <link rel="stylesheet" href="../../static/css/cool.css" media="all">
     <!--    <link rel="stylesheet" href="../../static/css/common.css" media="all">-->
     <!--[if lt IE 9]>
     <script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script>
     <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
     <![endif]-->
     <style>
+        .wrk-trace {
+            color: green;
+            cursor: pointer;
+            margin-left: 6px;
+            font-size: 18px;
+        }
+
+        .layui-timeline:first-child .layui-timeline-item {
+            margin-top: 30px;
+        }
         .btn-add {
             display: none;
         }
@@ -40,19 +50,36 @@
                 <div class="layui-form-item">
                     <div class="layui-inline">
                         <div class="layui-input-inline mr0">
-                            <input name="order_no" class="layui-input" type="text" placeholder="杈撳叆鍗曟嵁缂栧彿"/>
+                            <input name="order_no" class="layui-input" type="text" placeholder="杈撳叆鍗曟嵁缂栧彿" data-i18n-placeholder="input_order_no"/>
                         </div>
                     </div>
                     <div class="layui-inline" style="width: 300px">
                         <div class="layui-input-inline">
-                            <input class="layui-input layui-laydate-range" name="create_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
+                            <input class="layui-input layui-laydate-range" id="modi_time" name="create_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px" data-i18n-placeholder="start_end_time">
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <div class="layui-input-inline">
+                            <select name="doc_type" id="docType-query">
+                            </select>
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <div class="layui-input-inline">
+                            <select name="settle">
+                                <option value="" data-i18n="select_status">閫夋嫨鐘舵��</option>
+                                <option value="1" data-i18n="settle_1">寰呭鐞�</option>
+                                <option value="2" data-i18n="settle_2">浣滀笟涓�</option>
+                                <option value="4" data-i18n="settle_4">宸插畬鎴�</option>
+                                <option value="6" data-i18n="settle_6">涓婃姤瀹屾垚</option>
+                            </select>
                         </div>
                     </div>
                     <div class="layui-inline">
                         <button class="layui-btn icon-btn" lay-filter="tbSearch" lay-submit>
-                            <i class="layui-icon">&#xe615;</i>鎼滅储
+                            <i class="layui-icon">&#xe615;</i><span data-i18n="search">鎼滅储</span>
                         </button>
-                        <button id="orderAddBtn" class="layui-btn icon-btn btn-add"><i class="layui-icon">&#xe654;</i>娣诲姞
+                        <button id="orderAddBtn" class="layui-btn icon-btn btn-add"><i class="layui-icon">&#xe654;</i><span data-i18n="add">娣诲姞</span>
                         </button>
                     </div>
                 </div>
@@ -62,29 +89,37 @@
     </div>
     <div class="layui-card">
         <div class="layui-card-body">
-            鍏ュ簱閫氱煡鍗曪細鐢盓RP鎻愪緵鍗曟嵁缂栧彿銆佺被鍨嬨�佸崟鎹椂闂村強鐗╂枡鏄庣粏锛岀敓鎴愬叆搴撲綔涓氬崟锛屼负缁存姢绯荤粺楂樺彲鐢紝鐢ㄦ埛鍙嚜琛屾坊鍔犲叆搴撻�氱煡鍗曟暟鎹紝瀹屾垚鐙珛鐨勫叆搴撲綔涓氥��
-            <span class="text-danger">鎵嬪姩娣诲姞鏃讹紝璇锋鏌ュ崟鎹紪鍙锋槸鍚﹀湪ERP绯荤粺涓凡瀛樺湪锛岄伩鍏嶅彂鐢熸暟鎹敊璇棶棰樸��</span>
+            <span data-i18n="order_intro">鍏ュ簱閫氱煡鍗曪細鐢盓RP鎻愪緵鍗曟嵁缂栧彿銆佺被鍨嬨�佸崟鎹椂闂村強鐗╂枡鏄庣粏锛岀敓鎴愬叆搴撲綔涓氬崟锛屼负缁存姢绯荤粺楂樺彲鐢紝鐢ㄦ埛鍙嚜琛屾坊鍔犲叆搴撻�氱煡鍗曟暟鎹紝瀹屾垚鐙珛鐨勫叆搴撲綔涓氥��</span>
+            <span class="text-danger" data-i18n="order_intro_warning">鎵嬪姩娣诲姞鏃讹紝璇锋鏌ュ崟鎹紪鍙锋槸鍚﹀湪ERP绯荤粺涓凡瀛樺湪锛岄伩鍏嶅彂鐢熸暟鎹敊璇棶棰樸��</span>
         </div>
     </div>
 </div>
 <!-- 琛ㄦ牸鎿嶄綔鍒� -->
 <script type="text/html" id="operate">
-    {{# if (d.settle == 1 || d.settle == 2) { }}
-        <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a>
-        {{# if (d.settle == 2) { }}
-            <a class="layui-btn layui-btn-primary layui-border-blue layui-btn-xs btn-complete" lay-event="complete">瀹岀粨</a>
-        {{# } }}
+    {{# if (d.settle == 0 || d.settle == 1) { }}
+        <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">{{ I18n.t('modify') }}</a>
+        <a class="layui-btn layui-btn-danger layui-btn-xs btn-delete" lay-event="del">{{ I18n.t('delete') }}</a>
     {{# } }}
-    <a class="layui-btn layui-btn-danger layui-btn-xs btn-delete" lay-event="del">鍒犻櫎</a>
+    {{# if (d.settle == 2) { }}
+    <a class="layui-btn layui-btn-primary layui-border-blue layui-btn-xs btn-complete" lay-event="complete">{{ I18n.t('complete') }}</a>
+    {{# } }}
 </script>
 <!-- 琛ㄦ牸鎿嶄綔鍒� -->
 <script type="text/html" id="tbLook">
     <span class="layui-text">
         <a href="javascript:;" lay-event="look">
-            <i class="layui-icon" style="font-size: 12px;">&#xe61a;</i> 鏌ョ湅鍗曟嵁鏄庣粏
+            <i class="layui-icon" style="font-size: 12px;">&#xe61a;</i> <span data-i18n="view_order_detail">鏌ョ湅鍗曟嵁鏄庣粏</span>
         </a>
     </span>
 </script>
+<script type="text/html" id="orderNoTpl">
+    {{d.orderNo}}
+    {{# if(d.settle > 1 && d.settle !== 3){ }}
+
+    {{# } }}
+    <i class="layui-icon layui-icon-about wrk-trace" lay-tips="{{ I18n.t('wrk_trace') }}" lay-direction="2" lay-offset="-10px,0px" lay-event="wrkTrace"></i>
+</script>
+
 <!--<script type="text/html" id="settleTpl">-->
 <!--    <span name="settle" class="layui-badge layui-badge-gray">{{d.settle$}}</span>-->
 <!--</script>-->
@@ -103,17 +138,17 @@
           {{# }else if(d.settle === 6){ }}
           class="layui-badge layui-badge-gray"
           {{# } }}
-    >{{d.settle$}}</span>
+    >{{ typeof I18n !== 'undefined' ? I18n.t('settle_' + d.settle) : d.settle$ }}</span>
 </script>
 <!-- 琛ㄥ崟寮圭獥 -->
 <script type="text/html" id="editDialog">
     <form id="editForm" lay-filter="editForm" class="layui-form model-form">
         <input name="id" type="hidden"/>
         <div class="layui-form-item">
-            <label class="layui-form-label">鍗曟嵁绫诲瀷锛�</label>
+            <label class="layui-form-label" data-i18n="doc_type">鍗曟嵁绫诲瀷锛�</label>
             <div class="layui-input-block cool-auto-complete">
                 <input class="layui-input" name="docType" placeholder="璇疯緭鍏ュ崟鎹被鍨�" style="display: none">
-                <input id="docType$" name="docType$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ュ崟鎹被鍨�" onfocus=this.blur() lay-verType="tips" lay-verify="required">
+                <input id="docType$" name="docType$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ュ崟鎹被鍨�" onfocus=this.blur() lay-verType="tips" data-i18n-placeholder="please_input">
                 <div class="cool-auto-complete-window">
                     <input class="cool-auto-complete-window-input" data-key="docTypeQueryBydocType" onkeyup="autoLoad(this.getAttribute('data-key'))">
                     <select class="cool-auto-complete-window-select" data-key="docTypeQueryBydocTypeSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
@@ -122,55 +157,162 @@
             </div>
         </div>
         <div class="layui-form-item">
-            <label class="layui-form-label">鍗曟嵁缂栧彿锛�</label>
+            <label class="layui-form-label" data-i18n="order_no">鍗曟嵁缂栧彿锛�</label>
             <div class="layui-input-block">
-                <input id="orderNo" name="orderNo" placeholder="杈撳叆鍗曟嵁缂栧彿" type="text" class="layui-input" maxlength="20" lay-verType="tips" lay-verify="required"/>
+                <input id="orderNo" name="orderNo" placeholder="杈撳叆鍗曟嵁缂栧彿" type="text" class="layui-input" maxlength="20" lay-verType="tips" data-i18n-placeholder="input_order_no"/>
+<!--                lay-verify="required"-->
             </div>
         </div>
         <div class="layui-form-item" style="position: relative;">
-            <label class="layui-form-label">鍗曟嵁鏄庣粏锛�</label>
+            <label class="layui-form-label" data-i18n="order_detail">鍗曟嵁鏄庣粏锛�</label>
             <div class="layui-input-block">
                 <table id="formSSXMTable" lay-filter="formSSXMTable"></table>
             </div>
             <button class="layui-btn layui-btn-sm icon-btn" id="matAddBtnComment"
                     style="position: absolute; left: 20px;top: 60px;padding: 0 5px;" type="button">
-                <i class="layui-icon">&#xe654;</i>娣诲姞鏄庣粏
+                <i class="layui-icon">&#xe654;</i><span data-i18n="add_detail">娣诲姞鏄庣粏</span>
             </button>
         </div>
         <div class="layui-form-item text-right">
-            <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
-            <button class="layui-btn" lay-filter="orderEditSubmit" lay-submit>淇濆瓨</button>
+            <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog" data-i18n="cancel">鍙栨秷</button>
+            <button class="layui-btn" lay-filter="orderEditSubmit" lay-submit data-i18n="save">淇濆瓨</button>
         </div>
     </form>
 </script>
 <!-- 琛ㄦ牸鎿嶄綔鍒� -->
 <script type="text/html" id="formSSXMTableBar">
     <!--    <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="edit">淇敼</a>-->
-    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">{{ I18n.t('delete') }}</a>
 </script>
 <!-- 琛ㄥ崟寮圭獥 -->
 <script type="text/html" id="matEditDialog">
     <form id="matEditForm" lay-filter="matEditForm" class="layui-form model-form">
         <input name="experimentId" type="hidden"/>
-        <div class="layui-form-item">
-            <label class="layui-form-label">鐗╂枡 - 澶氶��</label>
+        <div class="layui-form-item" style="float: left">
+            <label class="layui-form-label" data-i18n="mat_multi_select">鐗╂枡 - 澶氶��</label>
             <div class="layui-input-block">
                 <div id="mat" name="mat">
                 </div>
             </div>
         </div>
-        <div class="layui-form-item text-right">
-            <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
-            <button class="layui-btn" lay-filter="matEditSubmit" lay-submit>淇濆瓨</button>
+        <div class="layui-form-item text-right" style="display: inline-block; margin-left: 35px">
+            <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog" data-i18n="cancel">鍙栨秷</button>
+            <button class="layui-btn" lay-filter="matEditSubmit" lay-submit data-i18n="save">淇濆瓨</button>
         </div>
     </form>
 </script>
+<!-- 璁㈠崟浠诲姟杩芥函 -->
+<script id="wrkTraceDialog" type="text/html" style="position: relative">
+    <div style="position: absolute; top: 0; left: 0;">
+        <div class="layui-card" style="overflow: hidden;">
+            <div class="layui-card-header" style="text-align: center;width: 80%;font-weight: inherit;font-size: 18px">{{ d.orderNo }}</div>
+            <div class="layui-card-body">
+                <div id="wrkTraceCharts" style="height: 300px;width: 400px;transform: translateX(-10%);"></div>
+            </div>
+        </div>
+    </div>
+    <div class="layui-row" >
+        <div class="layui-col-md5">
+            <h1 style="opacity: 0;">Hello World</h1>
+        </div>
+        <div  class="layui-col-md7" style="">
+            {{#  if(d.list.length > 0){ }}
+            <ul class="layui-timeline" style="height: 400px; overflow: scroll;">
+                {{#  layui.each(d.list, function(index, item){ }}
+                <li class="layui-timeline-item">
+                    <i class="layui-icon layui-timeline-axis">&#xe63f;</i>
+                    <div class="layui-timeline-content layui-text">
+                        <div class="layui-timeline-title">
+                            <h3 class="inline-block">
+                                {{ item.wrkNo }}&nbsp;
+
+                                {{#  if(item.wrkMast.ioType < 100){ }}
+                                <span class="layui-badge layui-bg-blue" style="line-height: 20px;">
+                                 {{ I18n.t('io_type_' + item.wrkMast.ioType) }}&nbsp;
+                                </span>
+                                {{#  } }}
+
+                                {{#  if(item.wrkMast.ioType > 100){ }}
+                                <span class="layui-badge layui-bg-orange" style="line-height: 20px;">
+                                  {{ I18n.t('io_type_' + item.wrkMast.ioType) }}&nbsp;
+                                </span>
+                                {{#  } }}
+
+
+                                {{#  if(item.wrkMast.wrkSts < 14){ }}
+                                <span class="layui-badge layui-bg-red" style="line-height: 20px;">
+                                    {{ I18n.t('wrk_status_' + item.wrkMast.wrkSts) }}&nbsp;
+                                </span>
+                                {{#  } }}
+
+                                {{#  if(item.wrkMast.wrkSts >= 14){ }}
+                                <span class="layui-badge layui-bg-green" style="line-height: 20px;">
+                                    {{ I18n.t('wrk_status_' + item.wrkMast.wrkSts) }}&nbsp;
+                                </span>
+                                {{#  } }}
+
+                            </h3>&emsp;
+                            {{ item.wrkMast.ioTime$ }}
+                        </div>
+
+                        <table class="layui-table" lay-skin="nob" style="width: 80%">
+                            <tbody>
+                            {{#  layui.each(item.wrkDetls, function(idx, wrkDetl){ }}
+                            <tr style="background: none">
+                <td>{{ I18n.t('serial_number') }}</td>
+                <td><span class="layui-badge layui-bg-cyan">{{ idx+1 }}</span></td>
+            </tr>
+                            <tr style="background: none">
+                                <td>{{ I18n.t('mat_code_label') }}</td>
+                                <td>{{ wrkDetl.matnr }}</td>
+                            </tr>
+                            <tr style="background: none">
+                                <td>{{ I18n.t('mat_name_label') }}</td>
+                                <td>{{ wrkDetl.maktx }}</td>
+                            </tr>
+                            <tr style="background: none">
+                                <td>{{ I18n.t('spec_label') }}</td>
+                                <td>{{ wrkDetl.specs }}</td>
+                            </tr>
+                            <tr style="background: none">
+                                <td>{{ I18n.t('qty_label') }}</td>
+                                <td style="font-weight: bold">{{ wrkDetl.anfme }}</td>
+                            </tr>
+                            <tr style="background: none">
+                                <td>{{ I18n.t('barcode_label') }}</td>
+                                <td style="font-weight: bold">{{ wrkDetl.zpallet }}</td>
+                            </tr>
+                            {{#  }); }}
+                            </tbody>
+                        </table>
+
+                        <hr class="layui-border-cyan" style="width: 90%; opacity: .6;">
+                    </div>
+                </li>
+                {{#  }); }}
+            </ul>
+            {{#  } else { }}
+            <div style="height: 350px;display: flex;justify-content: center;align-items: center;">
+                <h2 style="font-weight: bold;letter-spacing: 2px" data-i18n="no_task">鏆傛棤浠诲姟</h2>
+            </div>
+            {{#  } }}
+        </div>
+    </div>
+</script>
+
+<script type="text/html" id="docTypeTpl">
+    <option value="" data-i18n="please_select_type">璇烽�夋嫨绫诲瀷</option>
+    {{#each records}}
+    <option value="{{docId}}">{{transDocName}}</option>
+    {{/each}}
+</script>
 
 <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/order/order.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/layui/layui.js"></script>
+<script type="text/javascript" src="../../static/js/common.js"></script>
+<script type="text/javascript" src="../../static/js/cool.js"></script>
+<script type="text/javascript" src="../../static/js/i18n/i18n-helper.js"></script>
+<script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>
+<script type="text/javascript" src="../../static/js/order/order.js"></script>
 </body>
 </html>
-

--
Gitblit v1.9.1